rbcdio 0.03 → 0.04

data/configure.ac

@@ -18,7 +18,7 @@
 ## Note: the version number (the 2nd parameter in AC_INIT) 
 ## is picked up inside the Python debugger script.
 
-AC_INIT([rbcdio],[0.03],[libcdio-rubycdio-devel@gnu.org])
+AC_INIT([rbcdio],[0.04],[libcdio-rubycdio-devel@gnu.org])
 
 AC_REVISION([$Id: configure.ac,v 1.8 2008/09/22 20:26:24 rocky Exp $])dnl
 

data/example/README

@@ -7,11 +7,15 @@ libcdio supports Disc Images as well as a realCD-ROM, a CDRWIN
 (BIN/CUE), cdrdao (TOC) or Nero NRG disc image can be played as
 well. Run --help to get a list of options
 
-== cdchagne.rb
+== cdchange.rb
 
 A program to test if a CD has been changed since the last
 change test.
 
+== cdtext.rb
+
+A Program to show using cdtext. Similar to examples/cdtext.c from libcdio.
+
 == device.rb
 
 A program to show drive capabilities. Various drives on various OS/s
@@ -48,5 +52,3 @@ A program to show using ISO9660::IFS to extract a file.
 
 A program to list track numbers and logical sector numbers of a
 Compact Disc.
-
-$Id: README,v 1.4 2007/10/13 23:00:18 rocky Exp $

data/example/cdtext.rb

@@ -0,0 +1,70 @@
+#!/usr/bin/env ruby
+"""Program to show cdtext, similar to examples/cdtext.c"""
+#
+#  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
+#  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/>.
+
+# require 'rubygems'; require 'ruby-debug'; Debugger.start
+
+mypath = File.dirname(__FILE__)
+
+if (File::exists?(mypath + "/../lib/cdio.rb"))
+  $: << File.dirname(__FILE__) + '/../lib'
+  $: << File.dirname(__FILE__) + '/../ext/cdio'
+else
+  require 'rubygems'
+end
+require "cdio"
+
+def print_cdtext_track_info(device, track, message)
+  print message
+  t = device.track(track)
+  cdt = t.cdtext()
+  
+  for i in 0.upto(Rubycdio::MAX_CDTEXT_FIELDS) do
+    value = cdt.get(i)
+    # value can be empty but exist, compared to NULL values
+    if value.nil?
+      puts "\t%s: %s" % [Rubycdio::cdtext_field2str(i), value]
+    end
+  end
+end
+
+if ARGV[0]
+  begin
+    drive_name = sys.argv[1]
+    d = Cdio::Device(sys.argv[1])
+  rescue IOError
+    puts "Problem opening CD-ROM: %s" % drive_name
+   exit 1
+  end
+else
+  begin
+    d = Cdio::Device.new(nil, Rubycdio::DRIVER_UNKNOWN)
+    drive_name = d.device()
+  rescue IOError
+    puts "Problem finding a CD-ROM"
+    exit 1
+  end
+end
+
+i_tracks = d.num_tracks()
+t = d.first_track()
+i_first_track = t.track
+
+print_cdtext_track_info(d, 0, 'CD-Text for Disc:')
+for i in i_first_track.upto(i_tracks + i_first_track) do
+  print_cdtext_track_info(d, i, 'CD-Text for Track %d:' % i)
+end

data/example/drives.rb

@@ -1,62 +1,60 @@
 #!/usr/bin/env ruby
-# $Id: drives.rb,v 1.9 2007/10/13 23:25:41 rocky Exp $
+# $Id: drives.rb,v 1.11 2008/11/30 15:47:05 rocky Exp $
 #
-# Program to read CD blocks. See read-cd from the libcdio distribution
-# for a more complete program.
+#  Program to list CD drives and analyze the media type in them
 
+#  Copyright (C) 2006, 2007, 2008 Rocky Bernstein <rocky@gnu.org>
 #
-#    Copyright (C) 2006, 2007 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
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
 #
-#    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 2 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, write to the Free Software
-#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#  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/>.
+
 mypath = File.dirname(__FILE__)
 if(File::exists?(mypath + "/../lib/cdio.rb"))
-  $: << File.dirname(__FILE__) + '/../lib'
   $: << File.dirname(__FILE__) + '/../ext/cdio'
+  $: << File.dirname(__FILE__) + '/../lib'
 else
   require 'rubygems'
 end
 require "cdio"
 
 def print_drive_class(msg, bitmask, any)
-  cd_drives = Cdio::devices_with_cap(bitmask, any)
-  
-  puts "%s..." % msg
-  for drive in cd_drives
-    puts "Drive %s" % drive
-  end
-  puts "-----"
+    cd_drives = Rubycdio::get_devices_with_cap(bitmask, any)
+
+    puts "%s..." % msg
+    for drive in cd_drives
+	puts "Drive %s" % drive
+    end if cd_drives
+    puts "-----"
 end
 
 cd_drives = Cdio::devices(Rubycdio::DRIVER_DEVICE)
 if not cd_drives
-  puts "No CD-ROM drives found"
+    puts "No CD-ROM drives found"
   exit
 end
 for drive in cd_drives
-  puts "Drive %s" % drive
+    puts "Drive %s" % drive
 end
 
 puts "-----"
 
-print_drive_class("All CD-ROM drives (again)", Rubycdio::FS_MATCH_ALL, false);
-print_drive_class("All CD-DA drives...", Rubycdio::FS_AUDIO, false);
-print_drive_class("All drives with ISO 9660...", Rubycdio::FS_ISO_9660, false);
+print_drive_class("All CD-ROM drives (again)", Rubycdio::FS_MATCH_ALL, false)
+print_drive_class("All CD-DA drives...", Rubycdio::FS_AUDIO, false)
+print_drive_class("All drives with ISO 9660...", Rubycdio::FS_ISO_9660, false)
 print_drive_class("VCD drives...", 
-                  (Rubycdio::FS_ANAL_SVCD|Rubycdio::FS_ANAL_CVD|
-                   Rubycdio::FS_ANAL_VIDEOCD|Rubycdio::FS_UNKNOWN), true);
+                  (Rubycdio::FS_ANAL_SVCD | Rubycdio::FS_ANAL_CVD |
+                   Rubycdio::FS_ANAL_VIDEOCD | Rubycdio::FS_UNKNOWN), 
+                  true);
 
 
 

data/ext/cdio/Makefile

@@ -4,60 +4,83 @@ SHELL = /bin/sh
 #### Start of system configuration section. ####
 
 srcdir = .
-topdir = /usr/lib/ruby/1.8/i486-linux
-hdrdir = $(topdir)
-VPATH = $(srcdir):$(topdir):$(hdrdir)
+topdir = /usr/local/include/ruby-1.9.1
+hdrdir = /usr/local/include/ruby-1.9.1
+arch_hdrdir = /usr/local/include/ruby-1.9.1/$(arch)
+VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby
 prefix = $(DESTDIR)/usr/local
+rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
 exec_prefix = $(prefix)
-sitedir = $(DESTDIR)/usr/local/lib/site_ruby
-rubylibdir = $(libdir)/ruby/$(ruby_version)
-docdir = $(datarootdir)/doc/$(PACKAGE)
-dvidir = $(docdir)
-datarootdir = $(prefix)/share
-archdir = $(rubylibdir)/$(arch)
-sbindir = $(exec_prefix)/sbin
-psdir = $(docdir)
+vendorhdrdir = $(rubyhdrdir)/vendor_ruby
+sitehdrdir = $(rubyhdrdir)/site_ruby
+rubyhdrdir = $(includedir)/$(RUBY_BASE_NAME)-$(ruby_version)
+vendordir = $(rubylibprefix)/vendor_ruby
+sitedir = $(rubylibprefix)/site_ruby
+mandir = $(datarootdir)/man
 localedir = $(datarootdir)/locale
+libdir = $(exec_prefix)/lib
+psdir = $(docdir)
+pdfdir = $(docdir)
+dvidir = $(docdir)
 htmldir = $(docdir)
-datadir = $(datarootdir)
+infodir = $(datarootdir)/info
+docdir = $(datarootdir)/doc/$(PACKAGE)
+oldincludedir = $(DESTDIR)/usr/include
 includedir = $(prefix)/include
-infodir = $(prefix)/share/info
-sysconfdir = $(DESTDIR)/etc
-mandir = $(prefix)/share/man
-libdir = $(exec_prefix)/lib
+localstatedir = $(prefix)/var
 sharedstatedir = $(prefix)/com
-oldincludedir = $(DESTDIR)/usr/include
-pdfdir = $(docdir)
-sitearchdir = $(sitelibdir)/$(sitearch)
+sysconfdir = $(prefix)/etc
+datadir = $(datarootdir)
+datarootdir = $(prefix)/share
+libexecdir = $(exec_prefix)/libexec
+sbindir = $(exec_prefix)/sbin
 bindir = $(exec_prefix)/bin
-localstatedir = $(DESTDIR)/var
+rubylibdir = $(libdir)/$(ruby_install_name)/$(ruby_version)
+archdir = $(rubylibdir)/$(arch)
 sitelibdir = $(sitedir)/$(ruby_version)
-libexecdir = $(prefix)/lib/ruby1.8
+sitearchdir = $(sitelibdir)/$(sitearch)
+vendorlibdir = $(vendordir)/$(ruby_version)
+vendorarchdir = $(vendorlibdir)/$(sitearch)
 
-CC = cc
-LIBRUBY = $(LIBRUBY_SO)
+CC = gcc
+CXX = g++
+LIBRUBY = $(LIBRUBY_A)
 LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
-LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
-LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
+LIBRUBYARG_SHARED = -Wl,-R -Wl,$(libdir) -L$(libdir) -l$(RUBY_SO_NAME)
+LIBRUBYARG_STATIC = -Wl,-R -Wl,$(libdir) -L$(libdir) -l$(RUBY_SO_NAME)-static
+OUTFLAG = -o 
+COUTFLAG = -o 
 
 RUBY_EXTCONF_H = 
-CFLAGS   =  -fPIC -fno-strict-aliasing -g -g -O2  -fPIC 
-INCFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir)
-CPPFLAGS =  
-CXXFLAGS = $(CFLAGS) 
-DLDFLAGS = -L. -Wl,-Bsymbolic-functions -rdynamic -Wl,-export-dynamic  
+cflags   =  $(optflags) $(debugflags) $(warnflags)
+optflags = -O3
+debugflags = -g
+warnflags = -Wall -Wno-unused-parameter -Wno-parentheses -Wno-missing-field-initializers -Wpointer-arith -Wwrite-strings
+CFLAGS   = -fPIC $(cflags) 
+INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
+DEFS     = 
+CPPFLAGS =   $(DEFS) $(cppflags)
+CXXFLAGS = $(CFLAGS) $(cxxflags)
+ldflags  = -L.  -rdynamic -Wl,-export-dynamic
+dldflags = 
+archflag = 
+DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
 LDSHARED = $(CC) -shared
+LDSHAREDXX = $(CXX) -shared
 AR = ar
 EXEEXT = 
 
-RUBY_INSTALL_NAME = ruby1.8
-RUBY_SO_NAME = ruby1.8
-arch = i486-linux
-sitearch = i486-linux
-ruby_version = 1.8
-ruby = /usr/bin/ruby1.8
+RUBY_BASE_NAME = ruby
+RUBY_INSTALL_NAME = ruby
+RUBY_SO_NAME = ruby
+arch = x86_64-linux
+sitearch = $(arch)
+ruby_version = 1.9.1
+ruby = /usr/local/bin/ruby
 RUBY = $(ruby)
 RM = rm -f
+RM_RF = $(RUBY) -run -e rm -- -rf
+RMDIRS = $(RUBY) -run -e rmdir -- -p
 MAKEDIRS = mkdir -p
 INSTALL = /usr/bin/install -c
 INSTALL_PROG = $(INSTALL) -m 0755
@@ -69,17 +92,18 @@ COPY = cp
 preload = 
 
 libpath = . $(libdir)
-LIBPATH =  -L"." -L"$(libdir)"
+LIBPATH =  -L. -L$(libdir) -Wl,-R$(libdir)
 DEFFILE = 
 
 CLEANFILES = mkmf.log
 DISTCLEANFILES = 
+DISTCLEANDIRS = 
 
 extout = 
 extout_prefix = 
 target_prefix = 
 LOCAL_LIBS = -L/usr/local/lib -lcdio -lm  
-LIBS = $(LIBRUBYARG_SHARED)  -lpthread -ldl -lcrypt -lm   -lc
+LIBS =   -lpthread -lrt -ldl -lcrypt -lm   -lc
 SRCS = rubycdio_wrap.c
 OBJS = rubycdio_wrap.o
 TARGET = rubycdio
@@ -87,30 +111,42 @@ DLLIB = $(TARGET).so
 EXTSTATIC = 
 STATIC_LIB = 
 
+BINDIR        = $(bindir)
 RUBYCOMMONDIR = $(sitedir)$(target_prefix)
 RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
 RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
+HDRDIR        = $(rubyhdrdir)/ruby$(target_prefix)
+ARCHHDRDIR    = $(rubyhdrdir)/$(arch)/ruby$(target_prefix)
 
 TARGET_SO     = $(DLLIB)
-CLEANLIBS     = $(TARGET).so $(TARGET).il? $(TARGET).tds $(TARGET).map
-CLEANOBJS     = *.o *.a *.s[ol] *.pdb *.exp *.bak
-
-all:		$(DLLIB)
-static:		$(STATIC_LIB)
-
-clean:
+CLEANLIBS     = $(TARGET).so 
+CLEANOBJS     = *.o  *.bak
+
+all:    $(DLLIB)
+static: $(STATIC_LIB)
+.PHONY: all install static install-so install-rb
+.PHONY: clean clean-so clean-rb
+
+clean-rb-default::
+clean-rb::
+clean-so::
+clean: clean-so clean-rb-default clean-rb
 		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
 
-distclean:	clean
+distclean-rb-default::
+distclean-rb::
+distclean-so::
+distclean: clean distclean-so distclean-rb-default distclean-rb
 		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
 		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
+		@-$(RMDIRS) $(DISTCLEANDIRS)
 
-realclean:	distclean
+realclean: distclean
 install: install-so install-rb
 
 install-so: $(RUBYARCHDIR)
 install-so: $(RUBYARCHDIR)/$(DLLIB)
-$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
+$(RUBYARCHDIR)/$(DLLIB): $(RUBYARCHDIR) $(DLLIB)
 	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
 install-rb: pre-install-rb install-rb-default
 install-rb-default: pre-install-rb-default
@@ -126,24 +162,24 @@ site-install-rb: install-rb
 .SUFFIXES: .c .m .cc .cxx .cpp .C .o
 
 .cc.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
 
 .cxx.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
 
 .cpp.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
 
 .C.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
 
 .c.o:
-	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<
+	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
 
-$(DLLIB): $(OBJS)
-	@-$(RM) $@
+$(DLLIB): $(OBJS) Makefile
+	@-$(RM) $(@)
 	$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
 
 
 
-$(OBJS): ruby.h defines.h
+$(OBJS): $(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h $(arch_hdrdir)/ruby/config.h