gswax 0.0.1 → 0.0.2

data/lib/gswax.rb

@@ -1,7 +1,7 @@
 =begin
 
     gsWax
-    v 0.12.01
+    v 0.0.2
     
      an audio player for folks who miss their vinyl
 
@@ -79,7 +79,7 @@ Shoes.app(width: (727 * scl), height: (675 * scl), title: "gsWax") do
 			when "PREVIOUS_TRACK"; previous_track
 			when "NEXT_TRACK"; next_track
 			when "SHUFFLE_TOGGLE"; toggle_wax_shuffle
-			when "PLAYLIST_CLOSED"; @browser.delete_observer(@playlist) if @browser; @playlist = nil
+			when "PLAYLIST_CLOSED"; @playlist = nil
 			when "BROWSER_CLOSED"; @browser = nil
 			when "SETTINGS_CLOSED"; @settings_man = nil
 		end
@@ -105,8 +105,10 @@ Shoes.app(width: (727 * scl), height: (675 * scl), title: "gsWax") do
 		
 		if pos == "prepend"
 			tracks.reverse.each{|e| wax_lineup.insert(0, e)}
+			tracks.shuffle.each{|e| wax_lupine.insert(0, e)}
 		else
 			tracks.each{|e| wax_lineup << e}
+			tracks.shuffle.each{|e| wax_lupine << e}
 		end
 		
 		if flag
@@ -119,18 +121,30 @@ Shoes.app(width: (727 * scl), height: (675 * scl), title: "gsWax") do
 	def data_drop(data, context)
 		raw = CGI.unescape(data)
 		arr = raw.chomp.split("file:#{File::Separator}#{File::Separator}")
-		path = arr[-1]
 		okfiles = [/.mp3/, /.flac/, /.ogg/, /.wav/]
 		selected = []
-
-		if File.directory?(path)
-			Find.find(path){|item|
-				okfiles.each{|ok| selected << item if item.downcase =~ ok}
-			}
-		elsif File.exists?(path)
-			okfiles.each{|ok| selected << path if path.downcase =~ ok}
-		end
 		
+		arr.each{|path|
+			path.chomp!
+			if File.directory?(path)
+				Find.find(path){|item|
+					okfiles.each{|ok| selected << item if File.extname(item.downcase) =~ ok}
+				}
+			elsif File.file?(path)
+				ext  = File.extname(path.downcase)
+				okfiles.each{|ok| selected << path if ext =~ ok}
+				if ext == ".pls" or ext == ".m3u"
+					File.open(path){|file|
+						file.each_line{|line|
+							if line.include?("http:")
+								selected << /http.+/.match(line).to_s
+							end
+						}
+					}
+				end
+			end
+		}
+
 		add_to_list(selected)
 		@playlist.add(selected) if @playlist
 
@@ -146,7 +160,7 @@ Shoes.app(width: (727 * scl), height: (675 * scl), title: "gsWax") do
 					dir = Settings.music_dir
 				end
 			else
-				dir = Settings.brains_dir
+				dir = File.dirname(File.expand_path(__FILE__))
 			end
 			@browser = DirBrowser.new(dir)
 			@browser.add_observer(self, :on_signals)
@@ -156,10 +170,7 @@ Shoes.app(width: (727 * scl), height: (675 * scl), title: "gsWax") do
 	
 	def playlist(list)
 		if @playlist
-			#@playlist.delete_observers
-			@browser.delete_observer(@playlist) if @browser
-			@playlist.close_window
-			@playlist = nil
+			@playlist.close_window; @playlist = nil
 		else
 			@playlist = PlayList.new; @playlist.add(list)
 			@playlist.add_observer(self, :on_signals)
@@ -171,7 +182,9 @@ Shoes.app(width: (727 * scl), height: (675 * scl), title: "gsWax") do
 		stop_wax if wax_state != "stopped"
 		f_name = message[1]
 		Settings.playlist_file = f_name
-		self.wax_batter = 0
+		Settings.line_up.clear
+		tracks = message[2..-1]
+		tracks.each{|track| Settings.line_up << track}
 		read_wax_lineup
 		@table.update(Settings.at_bat)
 		@info_area.set_text("gsWax - ready to rock")
@@ -199,14 +212,16 @@ Shoes.app(width: (727 * scl), height: (675 * scl), title: "gsWax") do
 	
 	def track_progress
 		unless @tracking
-			GLib::Timeout.add(100){
+			timeout = GLib::Timeout.add(100){
 				if wax_state == "playing"
-					pos_query = Gst::QueryPosition.new(3)#(Gst::Format::Time)
-					wax_pipeline.query(pos_query)
-					track_pos = pos_query.parse[1] / 10000.0
-					arm_pos =(((track_pos * 1.0) / wax_duration) / 1000.0).round(1)
-					@table.set_arm_pos(arm_pos)
-					@tracking = true
+					if wax_tracking
+						pos_query = Gst::QueryPosition.new(3)
+						wax_pipeline.query(pos_query)
+						track_pos = pos_query.parse[1] / 10000.0
+						arm_pos =(((track_pos * 1.0) / wax_duration) / 1000.0).round(1)
+						@table.set_arm_pos(arm_pos)
+						@tracking = true
+					end
 				else
 					@tracking = false
 					false
@@ -225,7 +240,7 @@ Shoes.app(width: (727 * scl), height: (675 * scl), title: "gsWax") do
 			if wax_lineup.empty?
 				wax_lineup << track
 				batter_up_wax
-				playpause_track
+				play_pause_track
 			else
 				wax_lineup.insert(wax_batter + 1, track) unless Settings.shuffle
 				wax_lupine.insert(wax_batter + 1, track) if Settings.shuffle
@@ -236,7 +251,7 @@ Shoes.app(width: (727 * scl), height: (675 * scl), title: "gsWax") do
 	end
 	
 	def play_pause_track
-		playpause_wax
+		play_pause_wax
 		@table.set_state(wax_state)
 		track_progress
 	end
@@ -263,7 +278,7 @@ Shoes.app(width: (727 * scl), height: (675 * scl), title: "gsWax") do
 	def seek(percent)
 		if wax_duration
 			sought = wax_duration * percent
-      seek_to_wax((sought * 1000.0).round)
+      			seek_to_wax((sought * 1000.0).round)
 			@table.set_arm_pos(percent)
 		end
 	end

data/lib/gswax/Wax.rb

@@ -1,6 +1,6 @@
 =begin
 	
-	this file is part of: gsWax v. 0.12.01
+	this file is part of: gsWax v. 0.0.2
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -14,7 +14,7 @@ module Wax
   include Observable
   
   attr_accessor  :wax_coverart, :wax_duration, :wax_state, :wax_pipeline,
-		:wax_batter, :wax_lineup, :wax_lupine, :wax_info
+		:wax_batter, :wax_lineup, :wax_lupine, :wax_info, :wax_tracking
   
   #----------------------
   #  INITIALIZE
@@ -30,7 +30,7 @@ module Wax
 
   def read_wax_lineup
     @wax_lineup = []
-		unless Settings.line_up.empty?
+		if Settings.line_up
 			@wax_lineup = Settings.line_up
 			@wax_info = "gsWax - ready to rock"
 		else
@@ -76,32 +76,37 @@ module Wax
     if @wax_lineup.empty?
       batter_up_wax
     end
+		if @stream_thread; @stream_thread.exit; @stream_thread = nil; end
     if Settings.at_bat
-      if File.exists?(Settings.at_bat)
+			if Settings.at_bat =~ /http:/
+				@wax_pipeline.uri = Settings.at_bat
+				@wax_tracking = false
+        @wax_state = "playing"
+				@wax_info = "Stream: #{Settings.at_bat}"
+				send_wax_info("wax_info")
+				@stream_thread = Thread.new{@wax_pipeline.play}
+      elsif File.exists?(Settings.at_bat)
         @wax_pipeline.uri= GLib.filename_to_uri(Settings.at_bat)
-        bus = @wax_pipeline.bus
-        @tagMsg = []
-        
-        bus.add_watch {|bus, message|
-          case message.type
-            when Gst::Message::ERROR
-              p message.parse
-            when Gst::Message::EOS
-              @wax_state = "stopped"
-              next_wax
-              send_wax_info("eos")
-            when Gst::Message::TAG
-              @tagMsg << message.structure.entries
-              get_wax_tags
-          end
-          true
-        }
-        
+				@wax_tracking = true
         @wax_pipeline.play
         @wax_state = "playing"
         get_wax_duration
       end
-    
+			@tagMsg = []
+			@wax_pipeline.bus.add_watch{|bus, message|
+				case message.type
+					when Gst::Message::ERROR
+						p message.parse
+					when Gst::Message::EOS
+						@wax_state = "stopped"
+						next_wax
+						send_wax_info("eos")
+					when Gst::Message::TAG
+						@tagMsg << message.structure.entries
+						get_wax_tags
+				end
+				true
+			}
     else
       @wax_info = "no tracks"
       send_wax_info("wax_info")
@@ -177,7 +182,6 @@ module Wax
       @wax_info = @infoentries.join
       send_wax_info("wax_info")
     end
-    
   end #get_wax_tags
   
   
@@ -185,7 +189,7 @@ module Wax
   #  TRANSPORT
   #-----------------------
   
-  def playpause_wax
+  def play_pause_wax
     if Settings.at_bat
       if @wax_state == "stopped"
         play_wax
@@ -254,20 +258,5 @@ module Wax
     changed
     notify_observers(info)
   end
-  
-  def xsave_wax_settings(settings)
-    settings[0] = @wax_roster
-    if  @wax_shuffle == true
-      settings[1] = "shuffle on"
-    else
-      settings[1] = "shuffle off"
-    end
-    settings[2] = Settings.at_bat
-  
-    File.open(@settings_file, "w"){|file|
-      settings.each{|entry| file.puts(entry)}
-    }
-  end
-  
 
 end  #module Wax

data/lib/gswax/browser.rb

@@ -1,6 +1,6 @@
 =begin
 	
-	this file is part of: gsWax v. 0.12.01
+	this file is part of: gsWax v. 0.0.2
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -10,7 +10,7 @@
 class DirBrowser
 	include Observable
 	
-	def initialize(path = Settings.brains_dir)		
+	def initialize(path = File.expand_path(File.dirname(__FILE__)))
 		@okfiles = [/.mp3/, /.flac/, /.ogg/, /.wav/]
 		@selected = []
 		@listview = ListView.new		# def in shared.rb
@@ -132,12 +132,35 @@ class DirBrowser
 			dirs << iter[1] ? File.directory?(iter[1]) : files << iter[1]
 		}
 		
-		files.each{|file| @selected << file} if files[0]		
+		if files[0]
+			files.each{|path|
+				if File.extname(path.downcase) == ".pls" or File.extname(path.downcase) == ".m3u"
+					File.open(path){|file|
+						file.each_line{|line|
+							if line.include?("http:")
+								@selected << /http.+/.match(line).to_s
+							end
+						}
+					}
+				else
+					@selected << path
+				end
+			}
+		end
 		
 		if dirs[0]
 			dirs.each{|dir| 
 				Find.find(dir){|item|
-				@okfiles.each{|ok| @selected << item if item.downcase =~ ok}
+					@okfiles.each{|ok| @selected << item if File.extname(item.downcase) =~ ok}
+					if File.extname(item.downcase) == ".pls" or File.extname(item.downcase) == ".m3u"
+						File.open(item){|file|
+							file.each_line{|line|
+								if line.include?("http:")
+									@selected << /http.+/.match(line).to_s
+								end
+							}
+						}
+					end
 				}	
 			}
 		end
@@ -168,7 +191,7 @@ class DirBrowser
 							if File.directory?(item)
 								dirs << item unless File.basename(item)[0] == "."
 							else
-								@okfiles.each{|ok| files << item if item.downcase =~ ok}
+								@okfiles.each{|ok| files << item if File.extname(item.downcase) =~ ok}
 							end
 						end
 					end

data/lib/gswax/playlist.rb

@@ -1,6 +1,6 @@
 =begin
 	
-	this file is part of: gsWax v. 0.12.01
+	this file is part of: gsWax v. 0.0.2
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -9,7 +9,7 @@
 
 class PlayList
 	include Observable
-	attr_accessor :listview, :main
+	attr_accessor :listview
 	
 	def initialize
 		@selected = []
@@ -157,10 +157,10 @@ class PlayList
 	end
 	
 	def save_list
-		unless Dir.exists?((File.join(Settings.brains_dir, "playlists")))
-			Dir.mkdir(File.join(Settings.brains_dir, "playlists"))
+		unless Dir.exists?(File.dirname(File.expand_path(__FILE__)) + "/playlists/")
+			Dir.mkdir(File.dirname(File.expand_path(__FILE__)) + "/playlists/")
 		end
-		Dir.chdir(File.join(Settings.brains_dir, "playlists")){
+		Dir.chdir(File.dirname(File.expand_path(__FILE__)) + "/playlists/"){
 			@savefile = ask_save_file
 		}
 		

data/lib/gswax/scrollbox.rb

@@ -1,6 +1,6 @@
 =begin
 	
-	this file is part of: gsWax v. 0.12.01
+	this file is part of: gsWax v. 0.0.2
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.

data/lib/gswax/settings_manager.rb

@@ -1,6 +1,6 @@
 =begin
 	
-	this file is part of: gsWax v. 0.12.01
+	this file is part of: gsWax v. 0.0.2
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -175,7 +175,7 @@ class SettingsManager
 			
 			page2 = Gtk::VBox.new(false, 2)
 				about_frame = Gtk::Frame.new()
-				about = "gsWax version 0.12.1\nhttps://github.com/lljk/shoeWax/tree/onGreenShoes"
+				about = "gsWax version 0.0.2\nhttps://github.com/lljk/gsWax"
 				about_text = Gtk::Label.new(about)
 				about_text.set_alignment(0.05, 0.5)
 				about_text.set_wrap(true)
@@ -196,7 +196,7 @@ class SettingsManager
 		if Settings.music_dir
 			open_dir = Settings.music_dir if File.exists?(Settings.music_dir)
 		else
-			open_dir = Settings.brains_dir
+			open_dir = File.dirname(File.expand_path(__FILE__))
 		end
 		dialog = Gtk::FileChooserDialog.new(
 			nil,nil,

data/lib/gswax/shared.rb

@@ -1,6 +1,6 @@
 =begin
 	
-	this file is part of: gsWax v. 0.12.01
+	this file is part of: gsWax v. 0.0.2
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -11,9 +11,9 @@ require 'yaml'
 
 module Settings
 	
-	def self.read
-		@brains_dir = File.join(File.dirname(File.expand_path(__FILE__)))
-		@settings_file = File.join(@brains_dir, "settings", "settings.yml")
+	def self.read		
+		brains_dir = File.dirname(File.expand_path(__FILE__))
+		@settings_file = File.join(brains_dir, "settings", "settings.yml")
 		if File.exists?(@settings_file)
 			@settings = begin
 				YAML.load(File.open(@settings_file))
@@ -32,24 +32,21 @@ module Settings
 				[0, 0, 0],
 				nil,
 				0.5,
-				[]
+				nil
 			]
+			FileUtils.mkdir_p(File.join(brains_dir, "settings"))
 			self.save
 		end
 	end
 	
 	def self.save
-		#unless File.exists?(@settings_file)
-		#	Dir.mkdir(File.join(@brains_dir, "settings"), 0777)
-		#	File.new(@settings_file, "w")
-		#end
 		File.open(@settings_file, "w"){|file|
-			file.write(@settings.to_yaml)
+				file.write(@settings.to_yaml)
 		}
 	end
 	
 	def self.brains_dir
-		@brains_dir
+		File.dirname(File.expand_path(__FILE__))
 	end
 	
 	def self.settings

data/lib/gswax/turntable.rb

@@ -1,6 +1,6 @@
 =begin
 	
-	this file is part of: gsWax v. 0.12.01
+	this file is part of: gsWax v. 0.0.2
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -189,7 +189,7 @@ class Turntable
 		cover_file = File.join(Settings.brains_dir, "images", "no_cover.png")
 		cover_size = 485.0 * Settings.scale
 
-		if path
+		if path && File.exists?(path)
 			dir = File.dirname(path)
 			Dir.chdir(dir)
 			files = Dir['*.{jpg,JPG,png,PNG,gif,GIF}']

data/lib/gswax/version.rb

@@ -1,3 +1,3 @@
 module Gswax
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gswax
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-22 00:00:00.000000000 Z
+date: 2012-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: green_shoes
-  requirement: &82768080 !ruby/object:Gem::Requirement
+  requirement: &72033980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *82768080
+  version_requirements: *72033980
 - !ruby/object:Gem::Dependency
   name: gstreamer
-  requirement: &82766800 !ruby/object:Gem::Requirement
+  requirement: &72033760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *82766800
+  version_requirements: *72033760
 description: an audio player for folks who miss thier vinyl
 email:
 - jakekaiden@gmail.com
@@ -79,7 +79,7 @@ files:
 - lib/gswax/version.rb
 - lib/gswax.rb
 - bin/gswax
-homepage: ''
+homepage: https://sites.google.com/site/gswax0/home
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -99,9 +99,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: an audio player for folks who miss their vinyl
 test_files: []
-has_rdoc: