gtk2mp3 0.1.0 → 0.2.0

data/bin/gtk2mp3

@@ -18,7 +18,7 @@ program = Program.new( {
         'website'	=> 'http://ruby-gnome-apps.blogspot.com/search/label/MP3',
         'website-label'	=> 'Ruby-Gnome MP3',
         'license'	=> 'GPL',
-        'copyright'	=> '2010-10-08 06:20:21',
+        'copyright'	=> '2010-10-08 17:51:32',
         } )
 
 IO.popen(PLAYER,'w+') do |pipe|

data/lib/gtk2mp3.rb

@@ -20,16 +20,27 @@ module Gtk2MP3
     def load_song
       self.random_song
       @info.text = File.basename(@current,MP3)
-      @pipe.puts "#{C_LOAD} #{@current}"
+      @pipe.puts "#{C_LOAD} #{@current}"; @pipe.flush
     end
 
     def skip_song
-      @couple.demote
+      (@continue)? @couple.demote: (@continue = true)
       self.load_song
     end
 
+    def stop_song
+      if @continue then
+        @pipe.puts C_STOP; @pipe.flush
+        @previous = ''
+        @continue = false
+      else
+        @continue = true
+        self.load_song
+      end
+    end
+
     def pause_song
-      @pipe.puts C_PAUSE
+      @pipe.puts C_PAUSE; @pipe.flush
     end
 
     def delete_song
@@ -40,13 +51,11 @@ module Gtk2MP3
     end
 
     def initialize(window,pipe,program)
-      pipe.puts C_SILENCE
-      window.signal_connect('destroy'){ pipe.puts C_QUIT }
-
       @pipe = pipe
       @playlist = Gtk2MP3::Playlist.new(DIRECTORY)
       @current = ''
       @previous = ''
+      @continue = true
 
       vbox = Widgets::VBox.new(window)
 
@@ -56,38 +65,49 @@ module Gtk2MP3
       hbox = Widgets::HBox.new(vbox)
       Widgets::Label.new(*SPACER1, hbox) # Spacer
       Widgets::Button.new(*NEXT, hbox){ self.skip_song }
-      Widgets::Label.new(*SPACER2, hbox) # Spacer
-      Widgets::Button.new(*PAUSE, hbox){ self.pause_song }
-      Widgets::Label.new(*SPACER3, hbox) # Spacer
-      Widgets.define_composite(:CheckButton,:Button)
-      Widgets::CheckButtonButton.new(*DELETE, hbox){|is,*dummies|
-        if is.checkbutton.active? then
-          self.delete_song
-          is.checkbutton.active = false
-        end
-      }
+      if PAUSE then
+        Widgets::Label.new(*SPACER2, hbox) # Spacer
+        Widgets::Button.new(*PAUSE, hbox){ self.pause_song }
+      end
+      if STOP then
+        Widgets::Label.new(*SPACER2, hbox) # Spacer
+        Widgets::Button.new(*STOP, hbox){ self.stop_song }
+      end
+      if DELETE then
+        Widgets::Label.new(*SPACER3, hbox) # Spacer
+        Widgets.define_composite(:CheckButton,:Button)
+        Widgets::CheckButtonButton.new(*DELETE, hbox){|is,*dummies|
+          if is.checkbutton.active? then
+            self.delete_song
+            is.checkbutton.active = false
+          end
+        }
+      end
       Widgets::Label.new(*SPACER4, hbox) # Spacer
 
+      @pipe.puts C_SILENCE; @pipe.flush
       self.load_song
       Thread.new do
-        pipe.each do |line|
+        @pipe.each do |line|
           line.strip!
           $stderr.puts line if $trace
           if line =~ /^\@I\s+(\S.*)$/ then
             # :-??
           elsif line == '@P 0' then
-            @couple.promote
-            @previous = @current
-            self.load_song
+            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 }
+      program.append_dock_menu(PAUSE.first){ self.pause_song }	if PAUSE
+      program.append_dock_menu(STOP.first){ self.stop_song }	if STOP
       program.append_dock_menu(NEXT.first){ self.skip_song }
-
     end
   end
 end

data/lib/gtk2mp3/appconfig.rb

@@ -18,10 +18,10 @@ module Configuration
   WINDOW_DEFAULT_SIZE[0],WINDOW_DEFAULT_SIZE[1] = 0,0
   OPTIONS = {:modify_font => FONT[:Large]}.freeze
 
-  SPACER1 =
-  SPACER2 =
-  SPACER3 =
-  SPACER4 = [' ',	OPTIONS].freeze
+  SPACER1 = [' ',	OPTIONS].freeze
+  SPACER2 = [' ',	OPTIONS].freeze
+  SPACER3 = [' ',	OPTIONS].freeze
+  SPACER4 = ['   ',	OPTIONS].freeze
   INFO = {:modify_font => FONT[:Small]}.freeze
 
 
@@ -29,21 +29,22 @@ module Configuration
 
   CLICKED = 'clicked' # Signal (should be no need to edit)
   NEXT		= ['Next!',	OPTIONS,	CLICKED].freeze
-  PAUSE		= ['Pause',	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
 
   SELECT_A_FILE = [['Select a file', Gtk::FileChooser::ACTION_OPEN],HNIL].freeze
 
-  PLAYER	= 'mpg123 -q -a hw:0,0 -R'
+  PLAYER	= 'mpg123 -q -R' # 'mpg123 -q -a hw:0,0 -R'
   # mpg123 commands
   C_PAUSE	= 'P'
+  C_STOP	= 'S'
   C_SILENCE	= 'SILENCE'
   C_LOAD	= 'L'
   C_QUIT	= 'Q'
 
 ### Unused ####
 # C_LOADPAUSED	= 'LP'
-# C_STOP	= 'S'
 # C_VOLUME	= 'V'
 # C_TAG		= 'T'
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gtk2mp3
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - carlosjhr64@gmail.com