gtk2mp3 0.2.0 → 0.3.0

data/bin/gtk2mp3

@@ -18,18 +18,16 @@ program = Program.new( {
         'website'	=> 'http://ruby-gnome-apps.blogspot.com/search/label/MP3',
         'website-label'	=> 'Ruby-Gnome MP3',
         'license'	=> 'GPL',
-        'copyright'	=> '2010-10-08 17:51:32',
+        'copyright'	=> '2010-10-12 13:46:50',
         } )
 
-IO.popen(PLAYER,'w+') do |pipe|
-  begin
-    require 'gtk2mp3'
-    Gtk2MP3::Couple.load
-    program.window{|window| Gtk2MP3::GUI.new(window,pipe,program)}
-  rescue Exception
-    $!.puts_bang!
-  ensure
-    Gtk2MP3::Couple.dump
-    program.finalize
-  end
+begin
+  require 'gtk2mp3'
+  Gtk2MP3::Couple.load
+  program.window{|window| Gtk2MP3::GUI.new(window,program)}
+rescue Exception
+  $!.puts_bang!
+ensure
+  Gtk2MP3::Couple.dump
+  program.finalize
 end

data/lib/gtk2mp3.rb

@@ -4,8 +4,55 @@ require 'gtk2mp3/couple'
 module Gtk2MP3
   MP3 = '.mp3'
 
+  class Pipe
+    def _read
+      @thread = Thread.new do
+        @pipe.each do |line|
+          line.strip!
+          $stderr.puts line if $trace
+          if line =~ /^\@I\s+(\S.*)$/ then
+            # :-??
+          elsif line == '@P 0' then
+            if @gui.continue then
+              @gui.couple.promote
+              @gui.previous = @gui.current
+              @gui.load_song
+            end
+          end
+        end
+      end
+    end
+    def open
+      if !@pipe then
+        @pipe = IO.popen(Configuration::PLAYER,'w+')
+        self.puts C_SILENCE
+        self._read
+      end
+    end
+    def puts(string)
+      self.open
+      @pipe.puts string
+      @pipe.flush
+    end
+    def close
+      if @pipe then
+        @thread.kill
+        @thread = nil
+        @pipe.close
+        @pipe = nil
+      end
+    end
+    def initialize(gui)
+      @gui = gui
+      self.open
+    end
+  end
+
   class GUI
     include Configuration
+    attr_reader :continue, :couple, :current
+    attr_writer :previous
+
     def random_song
       plays = false
       while !plays do
@@ -20,7 +67,7 @@ module Gtk2MP3
     def load_song
       self.random_song
       @info.text = File.basename(@current,MP3)
-      @pipe.puts "#{C_LOAD} #{@current}"; @pipe.flush
+      @pipe.puts "#{C_LOAD} #{@current}"
     end
 
     def skip_song
@@ -30,9 +77,10 @@ module Gtk2MP3
 
     def stop_song
       if @continue then
-        @pipe.puts C_STOP; @pipe.flush
+        @pipe.puts C_STOP
         @previous = ''
         @continue = false
+        @pipe.close
       else
         @continue = true
         self.load_song
@@ -40,7 +88,7 @@ module Gtk2MP3
     end
 
     def pause_song
-      @pipe.puts C_PAUSE; @pipe.flush
+      @pipe.puts C_PAUSE
     end
 
     def delete_song
@@ -50,12 +98,14 @@ module Gtk2MP3
       self.load_song
     end
 
-    def initialize(window,pipe,program)
-      @pipe = pipe
+
+    def initialize(window,program)
       @playlist = Gtk2MP3::Playlist.new(DIRECTORY)
       @current = ''
       @previous = ''
       @continue = true
+      @pipe = Pipe.new(self)
+      window.signal_connect('destroy'){ @pipe.close }
 
       vbox = Widgets::VBox.new(window)
 
@@ -85,24 +135,7 @@ module Gtk2MP3
       end
       Widgets::Label.new(*SPACER4, hbox) # Spacer
 
-      @pipe.puts C_SILENCE; @pipe.flush
       self.load_song
-      Thread.new do
-        @pipe.each do |line|
-          line.strip!
-          $stderr.puts line if $trace
-          if line =~ /^\@I\s+(\S.*)$/ then
-            # :-??
-          elsif line == '@P 0' then
-            if @continue then
-              @couple.promote
-              @previous = @current
-              self.load_song
-            end
-          end
-        end
-        false
-      end
 
       program.append_app_menu(RELOAD){ @playlist.reload }
       program.append_dock_menu(PAUSE.first){ self.pause_song }	if PAUSE

data/lib/gtk2mp3/appconfig.rb

@@ -29,13 +29,13 @@ module Configuration
 
   CLICKED = 'clicked' # Signal (should be no need to edit)
   NEXT		= ['Next!',	OPTIONS,	CLICKED].freeze
-  PAUSE		= nil # ['Pause',	OPTIONS,	CLICKED].freeze # By default, want to keep it simple
-  STOP		= ['Stop',	OPTIONS,	CLICKED].freeze
-  DELETE	= ['Delete',	OPTIONS,	CLICKED].freeze
+  PAUSE		= ['Pause',	OPTIONS,	CLICKED].freeze # this one can be set to nil
+  STOP		= ['Stop',	OPTIONS,	CLICKED].freeze # this one can be set to nil
+  DELETE	= ['Delete',	OPTIONS,	CLICKED].freeze # this one can be set to nil
 
   SELECT_A_FILE = [['Select a file', Gtk::FileChooser::ACTION_OPEN],HNIL].freeze
 
-  PLAYER	= 'mpg123 -q -R' # 'mpg123 -q -a hw:0,0 -R'
+  PLAYER	= 'mpg123 -q -a hw:0,0 -R' # 'mpg123 -q -R'
   # mpg123 commands
   C_PAUSE	= 'P'
   C_STOP	= 'S'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gtk2mp3
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - carlosjhr64@gmail.com
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-08 00:00:00 -07:00
+date: 2010-10-12 00:00:00 -07:00
 default_executable: gtk2mp3
 dependencies: 
 - !ruby/object:Gem::Dependency