rbcdio 0.03 → 0.04

data/missing

@@ -1,9 +1,9 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
 #   Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
@@ -33,6 +33,8 @@ if test $# -eq 0; then
 fi
 
 run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
 
 # In the cases where this matters, `missing' is being run in the
 # srcdir already.
@@ -44,7 +46,7 @@ fi
 
 msg="missing on your system"
 
-case "$1" in
+case $1 in
 --run)
   # Try to run requested program, and just exit if it succeeds.
   run=
@@ -77,6 +79,7 @@ Supported PROGRAM values:
   aclocal      touch file \`aclocal.m4'
   autoconf     touch file \`configure'
   autoheader   touch file \`config.h.in'
+  autom4te     touch the output file, or create a stub one
   automake     touch all \`Makefile.in' files
   bison        create \`y.tab.[ch]', if possible, from existing .[ch]
   flex         create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@ esac
 # Now exit if we have it, but it failed.  Also exit now if we
 # don't have it and --version was passed (most likely to detect
 # the program).
-case "$1" in
+case $1 in
   lex|yacc)
     # Not GNU programs, they don't have --version.
     ;;
@@ -135,7 +138,7 @@ esac
 
 # If it does not exist, or fails to run (possibly an outdated version),
 # try to emulate it.
-case "$1" in
+case $1 in
   aclocal*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
@@ -164,7 +167,7 @@ WARNING: \`$1' is $msg.  You should only need it if
     test -z "$files" && files="config.h"
     touch_files=
     for f in $files; do
-      case "$f" in
+      case $f in
       *:*) touch_files="$touch_files "`echo "$f" |
 				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
       *) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@ WARNING: \`$1' is needed, but is $msg.
          You can get \`$1' as part of \`Autoconf' from any GNU
          archive site."
 
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
     if test -f "$file"; then
 	touch $file
     else
@@ -214,25 +217,25 @@ WARNING: \`$1' $msg.  You should only need it if
          in order for those modifications to take effect.  You can get
          \`Bison' from any GNU archive site."
     rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
+    if test $# -ne 1; then
         eval LASTARG="\${$#}"
-	case "$LASTARG" in
+	case $LASTARG in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.c
 	    fi
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.h
 	    fi
 	  ;;
 	esac
     fi
-    if [ ! -f y.tab.h ]; then
+    if test ! -f y.tab.h; then
 	echo >y.tab.h
     fi
-    if [ ! -f y.tab.c ]; then
+    if test ! -f y.tab.c; then
 	echo 'main() { return 0; }' >y.tab.c
     fi
     ;;
@@ -244,18 +247,18 @@ WARNING: \`$1' is $msg.  You should only need it if
          in order for those modifications to take effect.  You can get
          \`Flex' from any GNU archive site."
     rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
+    if test $# -ne 1; then
         eval LASTARG="\${$#}"
-	case "$LASTARG" in
+	case $LASTARG in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" lex.yy.c
 	    fi
 	  ;;
 	esac
     fi
-    if [ ! -f lex.yy.c ]; then
+    if test ! -f lex.yy.c; then
 	echo 'main() { return 0; }' >lex.yy.c
     fi
     ;;
@@ -267,11 +270,9 @@ WARNING: \`$1' is $msg.  You should only need it if
 	 \`Help2man' package in order for those modifications to take
 	 effect.  You can get \`Help2man' from any GNU archive site."
 
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-    fi
-    if [ -f "$file" ]; then
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -f "$file"; then
 	touch $file
     else
 	test -z "$file" || exec >$file
@@ -289,11 +290,17 @@ WARNING: \`$1' is $msg.  You should only need it if
          DU, IRIX).  You might want to install the \`Texinfo' package or
          the \`GNU make' package.  Grab either from any GNU archive site."
     # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
     if test -z "$file"; then
       # ... or it is the one specified with @setfilename ...
       infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+      file=`sed -n '
+	/^@setfilename/{
+	  s/.* \([^ ]*\) *$/\1/
+	  p
+	  q
+	}' $infile`
       # ... or it is derived from the source name (dir/f.texi becomes f.info)
       test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
     fi
@@ -317,13 +324,13 @@ WARNING: \`$1' is $msg.  You should only need it if
     fi
     firstarg="$1"
     if shift; then
-	case "$firstarg" in
+	case $firstarg in
 	*o*)
 	    firstarg=`echo "$firstarg" | sed s/o//`
 	    tar "$firstarg" "$@" && exit 0
 	    ;;
 	esac
-	case "$firstarg" in
+	case $firstarg in
 	*h*)
 	    firstarg=`echo "$firstarg" | sed s/h//`
 	    tar "$firstarg" "$@" && exit 0

data/swig/Makefile

@@ -1,5 +1,5 @@
 #=============================================================
-# $Id: Makefile,v 1.1.1.1 2006/11/13 05:13:32 rocky Exp $
+# $Id: Makefile,v 1.1 2006/11/13 05:13:32 rocky Exp $
 #=============================================================
 # Whatever it is you want to do, it should be handled by the 
 # by the main (parent) Makefile. So reissue make from there.

data/swig/cdtext.swg

@@ -0,0 +1,67 @@
+/* -*- c -*-
+  $Id: cdtext.swg,v 1.4 2008/05/01 16:55:05 karl Exp $
+
+  Copyright (C) 2009, Thomas Vander Stichele <thomas at apestaart dot org>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/* See <cdio/cdtext.h> For more extensive documentation */
+
+%constant long int CDTEXT_ARRANGER   = CDTEXT_ARRANGER;
+%constant long int CDTEXT_COMPOSER   = CDTEXT_COMPOSER;
+%constant long int CDTEXT_DISCID     = CDTEXT_DISCID;
+%constant long int CDTEXT_GENRE      = CDTEXT_GENRE;
+%constant long int CDTEXT_MESSAGE    = CDTEXT_MESSAGE;
+%constant long int CDTEXT_ISRC       = CDTEXT_ISRC;
+%constant long int CDTEXT_PERFORMER  = CDTEXT_PERFORMER;
+%constant long int CDTEXT_SIZE_INFO  = CDTEXT_SIZE_INFO;
+%constant long int CDTEXT_SONGWRITER = CDTEXT_SONGWRITER;
+%constant long int CDTEXT_TITLE      = CDTEXT_TITLE;
+%constant long int CDTEXT_TOC_INFO   = CDTEXT_TOC_INFO;
+%constant long int CDTEXT_TOC_INFO2  = CDTEXT_TOC_INFO2;
+%constant long int CDTEXT_UPC_EAN    = CDTEXT_UPC_EAN;
+
+%constant long int CDTEXT_INVALID    = CDTEXT_INVALID;
+%constant long int MIN_CDTEXT_FIELD  = MIN_CDTEXT_FIELD;
+%constant long int MAX_CDTEXT_FIELDS = MAX_CDTEXT_FIELDS;
+
+typedef unsigned long int cdtext_field_t;
+
+%feature("autodoc",
+"cdtext_field2str(key)->string
+Get the name of the key.");
+
+const char *cdtext_field2str (cdtext_field_t key);
+
+%feature("autodoc",
+"cdtext_get(key, p_cdtext)->string
+Get the value associated with key.");
+
+const char *cdtext_get (cdtext_field_t key, const cdtext_t *cdtext);
+
+%feature("autodoc",
+"cdtext_is_keyword(string)->int
+Returns enum value of keyword if the key is a CD-Text keyword,
+returns MAX_CDTEXT_FIELDS otherwise.");
+
+cdtext_field_t cdtext_is_keyword (const char *key);
+
+%feature("autodoc",
+"cdtext_set(key, string, p_cdtext)
+Set the value associated with key.");
+
+void cdtext_set (cdtext_field_t key, const char *value, cdtext_t *cdtext);
+
+

data/swig/device.swg

@@ -1,5 +1,5 @@
 /* -*- c -*-
-  $Id: device.swg,v 1.12 2008/05/02 13:05:40 karl Exp $
+  $Id: device.swg,v 1.13 2008/11/30 15:45:23 rocky Exp $
 
   Copyright (C) 2006, 2007, 2008 Rocky Bernstein <rocky@gnu.org>
 
@@ -31,9 +31,9 @@ typedef char ** DeviceList_t;
 
 %typemap(out) DeviceList_t {   
     // $1 is of type DeviceList_t
-    char **p   = result;
+    char **p = result;
 
-    if (result) {
+    if (result && *result) {
       VALUE aDevices = rb_ary_new();
       for (p = $1; *p; p++) {
 	rb_ary_push(aDevices, rb_str_new2(*p));

data/swig/disc.swg

@@ -1,5 +1,5 @@
 /* -*- c -*-
-  $Id: disc.swg,v 1.2 2008/05/02 13:05:40 karl Exp $
+  $Id: disc.swg,v 1.3 2008/11/30 14:17:24 rocky Exp $
 
   Copyright (C) 2006, 2008 Rocky Bernstein <rocky@gnu.org>
 
@@ -38,7 +38,7 @@
 "get_disc_last_lsn(cdio)->lsn
 Get the LSN of the end of the CD.
 
-perlcdio.INVALID_LSN is returned on error.");
+rubycdio.INVALID_LSN is returned on error.");
 lsn_t cdio_get_disc_last_lsn(const CdIo_t *p_cdio);
   
 

data/swig/rubycdio.swg

@@ -1,7 +1,7 @@
 /* -*- c -*-
   $Id: rubycdio.swg,v 1.4 2008/05/02 13:05:40 karl Exp $
 
-  Copyright (C) 2006, 2007, 2008 Rocky Bernstein <rocky@gnu.org>
+  Copyright (C) 2006, 2007, 2008, 2009 Rocky Bernstein <rocky@gnu.org>
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -32,6 +32,7 @@ use this library."
 
 #include <cdio/cdio.h> 
 #include <cdio/audio.h>
+#include <cdio/cdtext.h>
 
 %include "compat.swg"
 
@@ -45,6 +46,7 @@ use this library."
 %include "audio.swg"
 %include "read.swg"
 %include "track.swg"
+%include "cdtext.swg"
 
 /* In the presence of the exception handling, the order is important. 
    The below use %exception.

data/swig/track.swg

@@ -1,7 +1,5 @@
 /* -*- c -*-
-  $Id: track.swg,v 1.5 2008/05/02 13:05:41 karl Exp $
-
-  Copyright (C) 2006, 2008 Rocky Bernstein <rocky@gnu.org>
+  Copyright (C) 2006, 2008, 2009 Rocky Bernstein <rocky@gnu.org>
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -49,6 +47,14 @@
 
 typedef int track_flag_t;
 
+%rename cdio_get_cdtext get_cdtext;
+%feature("autodoc",
+"cdio_get_cdtext(track)->cdtext
+    Get the CDText object for the given track number.
+    Use track 0 for the disc's CDText object.");
+
+cdtext_t *cdio_get_cdtext (CdIo_t *p_cdio, track_t i_track);
+
 %rename cdio_get_first_track_num get_first_track_num;
 %feature("autodoc",
 "get_first_track_num(p_cdio) -> int
@@ -202,4 +208,3 @@ const char
 }
 %}
 
-