gme 0.0.9-x86-linux → 0.0.10-x86-linux

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.10

data/ext/gme/Makefile

@@ -0,0 +1,157 @@
+
+SHELL = /bin/sh
+
+#### Start of system configuration section. ####
+
+srcdir = .
+topdir = /usr/lib/ruby/1.8/i486-linux
+hdrdir = $(topdir)
+VPATH = $(srcdir):$(topdir):$(hdrdir)
+exec_prefix = $(prefix)
+prefix = $(DESTDIR)/usr
+sharedstatedir = $(prefix)/com
+mandir = $(prefix)/share/man
+psdir = $(docdir)
+oldincludedir = $(DESTDIR)/usr/include
+localedir = $(datarootdir)/locale
+bindir = $(exec_prefix)/bin
+libexecdir = $(prefix)/lib/ruby1.8
+sitedir = $(DESTDIR)/usr/local/lib/site_ruby
+htmldir = $(docdir)
+vendorarchdir = $(vendorlibdir)/$(sitearch)
+includedir = $(prefix)/include
+infodir = $(prefix)/share/info
+vendorlibdir = $(vendordir)/$(ruby_version)
+sysconfdir = $(DESTDIR)/etc
+libdir = $(exec_prefix)/lib
+sbindir = $(exec_prefix)/sbin
+rubylibdir = $(libdir)/ruby/$(ruby_version)
+docdir = $(datarootdir)/doc/$(PACKAGE)
+dvidir = $(docdir)
+vendordir = $(libdir)/ruby/vendor_ruby
+datarootdir = $(prefix)/share
+pdfdir = $(docdir)
+archdir = $(rubylibdir)/$(arch)
+sitearchdir = $(sitelibdir)/$(sitearch)
+datadir = $(datarootdir)
+localstatedir = $(DESTDIR)/var
+sitelibdir = $(sitedir)/$(ruby_version)
+
+CC = gcc
+LIBRUBY = $(LIBRUBY_SO)
+LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
+LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
+LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
+
+RUBY_EXTCONF_H = 
+CFLAGS   =  -fPIC -fno-strict-aliasing -g -g -O2  -fPIC $(cflags) 
+INCFLAGS = -I. -I. -I/usr/lib/ruby/1.8/i486-linux -I.
+DEFS     = -D_FILE_OFFSET_BITS=64
+CPPFLAGS =   -D_FILE_OFFSET_BITS=64 
+CXXFLAGS = $(CFLAGS) 
+ldflags  = -L. -Wl,-Bsymbolic-functions -rdynamic -Wl,-export-dynamic
+dldflags = 
+archflag = 
+DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
+LDSHARED = $(CC) -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 = $(ruby)
+RM = rm -f
+MAKEDIRS = mkdir -p
+INSTALL = /usr/bin/install -c
+INSTALL_PROG = $(INSTALL) -m 0755
+INSTALL_DATA = $(INSTALL) -m 644
+COPY = cp
+
+#### End of system configuration section. ####
+
+preload = 
+
+libpath = . $(libdir)
+LIBPATH =  -L. -L$(libdir)
+DEFFILE = 
+
+CLEANFILES = mkmf.log
+DISTCLEANFILES = 
+
+extout = 
+extout_prefix = 
+target_prefix = 
+LOCAL_LIBS = 
+LIBS = $(LIBRUBYARG_SHARED) -lgme  -lpthread -lrt -ldl -lcrypt -lm   -lc
+SRCS = gme_funcs.c gme.c util.c
+OBJS = gme_funcs.o gme.o util.o
+TARGET = gme_ext
+DLLIB = $(TARGET).so
+EXTSTATIC = 
+STATIC_LIB = 
+
+BINDIR        = $(bindir)
+RUBYCOMMONDIR = $(sitedir)$(target_prefix)
+RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
+RUBYARCHDIR   = $(sitearchdir)$(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:
+		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
+
+distclean:	clean
+		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
+		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
+
+realclean:	distclean
+install: install-so install-rb
+
+install-so: $(RUBYARCHDIR)
+install-so: $(RUBYARCHDIR)/$(DLLIB)
+$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
+	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
+install-rb: pre-install-rb install-rb-default
+install-rb-default: pre-install-rb-default
+pre-install-rb: Makefile
+pre-install-rb-default: Makefile
+$(RUBYARCHDIR):
+	$(MAKEDIRS) $@
+
+site-install: site-install-so site-install-rb
+site-install-so: install-so
+site-install-rb: install-rb
+
+.SUFFIXES: .c .m .cc .cxx .cpp .C .o
+
+.cc.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.cxx.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.cpp.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.C.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.c.o:
+	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<
+
+$(DLLIB): $(OBJS) Makefile
+	@-$(RM) $@
+	$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
+
+
+
+$(OBJS): ruby.h defines.h

data/ext/gme/gme.c

@@ -19,7 +19,7 @@ void Init_gme_ext()
     rb_funcall(cEmulator, rb_intern("attr_reader"), 1, ID2SYM(rb_intern("info")));
     rb_funcall(cEmulator, rb_intern("attr_reader"), 1, ID2SYM(rb_intern("track_count")));
     /* rb_define_alloc_func(cEmulator, gme_alloc); */
-    rb_define_singleton_method(cEmulator, "open", gme_ruby_open, 2);
+    rb_define_singleton_method(cEmulator, "open", gme_ruby_open, -1);
     rb_define_method(cEmulator, "close", gme_ruby_close, 0);
     rb_define_method(cEmulator, "start_track", gme_ruby_start_track, -1);
     rb_define_method(cEmulator, "get_samples", gme_ruby_get_samples, 1);

data/ext/gme/gme_funcs.c

@@ -9,25 +9,40 @@ extern VALUE eInvalidFile;
 
 void gme_ruby_emu_free(void* pointer);
 
-VALUE gme_ruby_open(VALUE self, VALUE path, VALUE sample_rate)
+/*
+ * Opens a new input file
+ * Returns a new instance of GME::Emulator
+ */
+VALUE gme_ruby_open(int argc, VALUE* argv, VALUE self)
 {
-    Music_Emu* emulator;
-    int c_sample_rate;
-    char* c_path;
-    int track = 0;
+    Music_Emu*  emulator;
+    int         c_sample_rate;
+    char*       c_path;
+    int         track = 0; // uses track 0 for getting info (FIXME)
     gme_info_t* info;
 
-    VALUE string = StringValue(path);
+    // use the first (mandatory) argument, as path to file
+    VALUE string = StringValue(argv[0]);
     c_path = RSTRING_PTR(string);
-    c_sample_rate = FIX2INT(sample_rate);
 
+    // use the second argument, if present, as sample rate
+    if(argc >= 2) {
+        c_sample_rate = FIX2INT(argv[1]);
+    }
+    else {
+        c_sample_rate = 44100;
+    }
+
+    // opens the specified file
     handle_error(gme_open_file(c_path, &emulator, c_sample_rate), eInvalidFile);
+    // and gets the info on the track
     handle_error(gme_track_info(emulator, &info, track), eGenericException);
 
+    // creates a new instance of GME::Emulator, as a wrapper around Music_Emu
     VALUE new_instance = Data_Wrap_Struct(cEmulator, 0, gme_ruby_emu_free, emulator);
 
+    // Fills the info hash
     VALUE info_hash = rb_hash_new();
-
     rb_hash_aset(info_hash, ID2SYM(rb_intern("play_length")), INT2FIX(info->play_length));
     rb_hash_aset(info_hash, ID2SYM(rb_intern("length")), INT2FIX(info->length));
     rb_hash_aset(info_hash, ID2SYM(rb_intern("intro_length")), INT2FIX(info->intro_length));
@@ -39,40 +54,37 @@ VALUE gme_ruby_open(VALUE self, VALUE path, VALUE sample_rate)
     rb_hash_aset(info_hash, ID2SYM(rb_intern("copyright")), rb_str_new2(info->copyright));
     rb_hash_aset(info_hash, ID2SYM(rb_intern("comment")), rb_str_new2(info->comment));
     rb_hash_aset(info_hash, ID2SYM(rb_intern("dumper")), rb_str_new2(info->dumper));
-
     rb_iv_set(new_instance, "@info", info_hash);
+    gme_free_info(info);
 
+    // sets the track count
     int track_count = gme_track_count(emulator);
     rb_iv_set(new_instance, "@track_count", INT2FIX(track_count));
 
-    gme_free_info(info);
-
+    // returns the new instance of GME::Emulator
     return new_instance;
 }
 
+/*
+ * is this function really needed?
+ */
 VALUE gme_ruby_close(VALUE self)
 {
-    // TODO: Es necesario esto?
-
-    /* Music_Emu* emulator; */
-    /* gme_info_t* info; */
-
-    /* Data_Get_Struct(self, Music_Emu, emulator); */
-    /* Data_Get_Struct(self, gme_info_t, info); */
-
-    /* gme_ruby_emu_free(emulator); */
-    /* gme_ruby_info_free(info); */
-
     return Qnil;    
 }
 
+/*
+ * starts a track
+ * if not specified, uses track number 0
+ */
 VALUE gme_ruby_start_track(int argc, VALUE* argv, VALUE self)
 {
     Music_Emu* emulator;
-    int c_track;
+    int        c_track;
 
     Data_Get_Struct(self, Music_Emu, emulator);
 
+    // uses the first argument, if present, as track number
     if(argc >= 1) {
         c_track = FIX2INT(argv[0]);
     }
@@ -81,39 +93,56 @@ VALUE gme_ruby_start_track(int argc, VALUE* argv, VALUE self)
         c_track = 0;
     }
 
+    // starts the track
     handle_error(gme_start_track(emulator, c_track), eGenericException);
 
-    return Qnil;
+    // returns the track number started
+    return INT2FIX(c_track);
 }
 
+/*
+ * Plays the specified number of samples
+ * FIXME: This function allocates a buffer each time it is called.
+ *        Maybe we should use a one-time allocated buffer.  
+ */
 VALUE gme_ruby_get_samples(VALUE self, VALUE samples)
 {
-    int buffer_size = FIX2INT(samples);
+    int        buffer_size = FIX2INT(samples); // buffer size equal to number of samples
     Music_Emu* emulator;
-    int c_samples;
-    short* c_buffer;
+    int        c_samples;
+    short*     c_buffer;
 
     Data_Get_Struct(self, Music_Emu, emulator);
 
+    // allocates memory for a buffer
     c_buffer = (short*) malloc(buffer_size * sizeof(short));
 
+    // plays the file, returning the specified number of samples
     handle_error(gme_play(emulator, buffer_size, c_buffer), eGenericException);
 
+    // creates a ruby string, containing the buffer content (generated samples)
     VALUE ruby_string = rb_str_new((const char*)c_buffer, buffer_size * sizeof(short));
 
+    // releases the allocated memory
     free(c_buffer);
 
+    // returns the played samples
     return ruby_string;
 }
 
+/*
+ * Plays the track 0 of the input file
+ * and writes in the specified (ruby) output file
+ */
 VALUE gme_ruby_play_to_file(VALUE self, VALUE file)
 {
-    int buffer_size = 1024;
-    short* buffer;
-    FILE* stdio_file;
+    int        buffer_size = 1024; // hardcoded buffer size (TODO?)
+    short*     buffer;
+    FILE*      stdio_file;
     Music_Emu* emulator;
-    int track = 0;
+    int        track       = 0;    // plays track 0 (TODO?)
 
+    // allocates memory for the buffer
     buffer = (short*) malloc(buffer_size * sizeof(short));
 
     Data_Get_Struct(self, Music_Emu, emulator);
@@ -121,28 +150,34 @@ VALUE gme_ruby_play_to_file(VALUE self, VALUE file)
     // TODO: fix for ruby-1.9 (fptr->stdio_file)
     stdio_file = RFILE(file)->fptr->f;
 
+    // if the stdio pointer couldn't be accesed, exit the program
     if(stdio_file == NULL) {
         rb_fatal("Couldn't access stdio FILE pointer");
     }
 
-    gme_ignore_silence(emulator, 1);
-
+    // starts track 0
     handle_error(gme_start_track(emulator, track), eGenericException);
 
+    // gets the play length of the track from the info hash
     VALUE info_hash = rb_iv_get(self, "@info");
     int play_length = FIX2INT(rb_hash_aref(info_hash, ID2SYM(rb_intern("play_length"))));
 
+    // plays the track completely
     while(gme_tell(emulator) < play_length) {
         handle_error(gme_play(emulator, buffer_size, buffer), eGenericException);
         write_samples(stdio_file, buffer_size, buffer);
         fflush(stdio_file);
     }
 
+    // releases the memory of the buffer
     free(buffer);
 
     return Qnil;
 }
 
+/*
+ * free function to the GME::Emulator wrapper for Music_Emu
+ */
 void gme_ruby_emu_free(void* pointer)
 {
     if(pointer != NULL) gme_delete(pointer);

data/ext/gme/gme_funcs.h

@@ -4,7 +4,7 @@
 #include <ruby.h>
 #include <gme/gme.h>
 
-VALUE gme_ruby_open(VALUE self, VALUE path, VALUE sample_rate);
+VALUE gme_ruby_open(int argc, VALUE* argv, VALUE self);
 VALUE gme_ruby_close(VALUE self);
 VALUE gme_ruby_start_track(int argc, VALUE* argv, VALUE self);
 VALUE gme_ruby_get_samples(VALUE self, VALUE samples);

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 9
-  version: 0.0.9
+  - 10
+  version: 0.0.10
 platform: x86-linux
 authors: 
 - "Carlos Beltr\xC3\xA1n-Recabarren"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-17 00:00:00 -04:00
+date: 2010-04-21 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -31,6 +31,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- ext/gme/Makefile
 - ext/gme/extconf.rb
 - ext/gme/gme.c
 - ext/gme/gme_funcs.c