listlace 0.0.6 → 0.0.7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    listlace (0.0.5)
+    listlace (0.0.6)
       activerecord
       activesupport
       open4

data/lib/listlace/commands/library_commands.rb

@@ -1,89 +1,20 @@
 module Listlace
   module Commands
     module LibraryCommands
+      # Save a playlist to the database. As a shortcut, you can pass the name
+      # to save it as, instead of setting the name on the playlist and then
+      # saving it.
       def save(playlist, name = nil)
         playlist.name = name if name
-        if model = library.playlists.where(name: playlist.name).first
-          model.playlist_items.destroy_all
-        else
-          model = library.playlists.new(name: playlist.name)
-          model.save!
-        end
-
-        playlist.each.with_index do |track, i|
-          item = PlaylistItem.new(position: i)
-          item.playlist = model
-          item.track = track
-          item.save!
-        end
-        playlist
+        library.save_playlist(playlist)
       end
 
       # Imports the music library from another program. Currently only iTunes is
       # supported.
       def import(from, path)
-        if not File.exists?(path)
-          puts "File '%s' doesn't exist." % [path]
-        elsif from == :itunes
-          puts "Parsing XML..."
-          data = Plist::parse_xml(path)
-
-          puts "Importing #{data['Tracks'].length} tracks..."
-          num_tracks = 0
-          whitelist = library.tracks.new.attributes.keys
-          data["Tracks"].each do |track_id, row|
-            # row already contains a hash of attributes almost ready to be passed to
-            # ActiveRecord. We just need to modify the keys, e.g. change "Play Count"
-            # to "play_count".
-            attributes = row.inject({}) do |acc, (key, value)|
-              attribute = key.gsub(" ", "").underscore
-              attribute = "original_id" if attribute == "track_id"
-              acc[attribute] = value if whitelist.include? attribute
-              acc
-            end
-
-            # change iTunes' URL-style locations into simple paths
-            if attributes["location"] && attributes["location"] =~ /^file:\/\//
-              attributes["location"].sub! /^file:\/\/localhost/, ""
-
-              # CGI::unescape changes plus signs to spaces. This is a work around to
-              # keep the plus signs.
-              attributes["location"].gsub! "+", "%2B"
-
-              attributes["location"] = CGI::unescape(attributes["location"])
-            end
-
-            track = library.tracks.new(attributes)
-
-            if track.kind =~ /audio/
-              if track.save
-                num_tracks += 1
-              end
-            else
-              puts "[skipping non-audio file]"
-            end
-          end
-          puts "Imported #{num_tracks} tracks successfully."
-
-          puts "Importing #{data['Playlists'].length} playlists..."
-          num_playlists = 0
-          data["Playlists"].each do |playlist_data|
-            playlist = []
-            playlist.name = playlist_data["Name"]
-
-            if ["Library", "Music", "Movies", "TV Shows", "iTunes DJ"].include? playlist.name
-              puts "[skipping \"#{playlist.name}\" playlist]"
-            else
-              playlist_data["Playlist Items"].map(&:values).flatten.each do |original_id|
-                playlist << library.tracks.where(original_id: original_id).first
-              end
-              playlist.compact!
-              save playlist
-              num_playlists += 1
-            end
-          end
-          puts "Imported #{num_playlists} playlists successfully."
-        end
+        library.import(from, path, logger: method(:puts))
+      rescue Library::FileNotFoundError => e
+        puts e.message
       end
 
       # Wipes the database. With no arguments, it just asks "Are you sure?" without

data/lib/listlace/commands/player_commands.rb

@@ -17,7 +17,7 @@ module Listlace
               player.pause
               status
             else
-              player.set_speed 1
+              player.speed = 1
               status
             end
           else
@@ -29,7 +29,6 @@ module Listlace
             end
           end
         else
-          player.stop
           player.clear
           q *tracks
           p
@@ -51,7 +50,8 @@ module Listlace
 
       # Go back one song in the queue.
       def back(n = 1)
-        if player.back(n)
+        player.back(n)
+        if player.started?
           status
         else
           puts "End of queue."
@@ -60,7 +60,8 @@ module Listlace
 
       # Go directly to the next song in the queue.
       def skip(n = 1)
-        if player.skip(n)
+        player.skip(n)
+        if player.started?
           status
         else
           puts "End of queue."
@@ -83,7 +84,7 @@ module Listlace
       # find agreeable. Call p to go back to normal. You can also pass a value
       # smaller than one to slow down.
       def ff(speed = 2)
-        player.set_speed(speed)
+        player.speed = speed
         status
       end
 
@@ -112,7 +113,7 @@ module Listlace
           case type
           when :playlist
             if player.started?
-            track_number = player.current_track_index + 1
+              track_number = player.current_track_index + 1
               num_tracks = q.length
               repeat_one = player.repeat_mode == :one ? REPEAT_SYMBOL : ""
               repeat_all = player.repeat_mode == :all ? REPEAT_SYMBOL : ""
@@ -127,7 +128,8 @@ module Listlace
               time = player.formatted_current_time
               total_time = player.current_track.formatted_total_time
               paused = player.paused? ? "|| " : ""
-              speed = player.speed != 1 ? "#{TIMES_SYMBOL}#{player.speed} " : ""
+              speed = player.speed
+              speed = speed != 1 ? "#{TIMES_SYMBOL}#{speed} " : ""
               puts "%s - %s (%s / %s) %s%s" % [name, artist, time, total_time, paused, speed]
             else
               puts "Stopped."

data/lib/listlace/{array_ext.rb → core_ext/array.rb}

@@ -1,6 +1,8 @@
 class Array
   attr_accessor :name
 
+  # Check if this array is a playlist. It's a playlist if it has
+  # a name attribute set or consists entirely of Track instances.
   def playlist?
     if @name || all? { |x| x.is_a? Listlace::Track }
       @name ||= ""
@@ -10,16 +12,29 @@ class Array
     end
   end
 
+  # Returns a new array that is shuffled, but with elem at the top.
+  # This is how playlists that are currently playing are shuffled.
+  # The currently playing track goes to the top, the rest of the
+  # tracks are shuffled.
   def shuffle_except(elem)
     ary = dup
     dup.shuffle_except! elem
     dup
   end
 
+  # Like shuffle_except, but shuffles in-place.
   def shuffle_except!(elem)
-    replace([elem] + (self - [elem]).shuffle)
+    if i = index(elem)
+      delete_at(i)
+      shuffle!
+      unshift(elem)
+    else
+      shuffle!
+    end
   end
 
+  # Override to_s to check if the array is a playlist, and format
+  # it accordingly.
   alias _original_to_s to_s
   def to_s
     if playlist?
@@ -29,11 +44,13 @@ class Array
     end
   end
 
+  # Override inspect for nice pry output.
   alias _original_inspect inspect
   def inspect
     playlist? ? to_s : _original_inspect
   end
 
+  # Override pretty_inspect for nice pry output.
   alias _original_pretty_inspect pretty_inspect
   def pretty_inspect
     playlist? ? inspect : _original_pretty_inspect

data/lib/listlace/library.rb

@@ -1,8 +1,7 @@
-require "listlace/library/database"
-require "listlace/library/selectors"
-
 module Listlace
   class Library
+    class FileNotFoundError < ArgumentError; end
+
     def initialize(options = {})
       options[:db_path] ||= "library"
       options[:db_adapter] ||= "sqlite3"
@@ -37,5 +36,89 @@ module Listlace
     def wipe
       Database.wipe(@db_adapter, @db_path)
     end
+
+    def save_playlist(playlist)
+      playlist_table = playlists.arel_table
+      if model = playlists.where(playlist_table[:name].matches(playlist.name)).first
+        model.playlist_items.destroy_all
+      else
+        model = playlists.new(name: playlist.name)
+        model.save!
+      end
+
+      playlist.each.with_index do |track, i|
+        item = PlaylistItem.new(position: i)
+        item.playlist = model
+        item.track = track
+        item.save!
+      end
+      playlist
+    end
+
+    def import(from, path, options = {})
+      logger = options[:logger]
+      if not File.exists?(path)
+        raise FileNotFoundError, "File '%s' doesn't exist." % [path]
+      elsif from == :itunes
+        logger.("Parsing XML...") if logger
+        data = Plist::parse_xml(path)
+
+        logger.("Importing #{data['Tracks'].length} tracks...") if logger
+        num_tracks = 0
+        whitelist = tracks.new.attributes.keys
+        data["Tracks"].each do |track_id, row|
+          # row already contains a hash of attributes almost ready to be passed to
+          # ActiveRecord. We just need to modify the keys, e.g. change "Play Count"
+          # to "play_count".
+          attributes = row.inject({}) do |acc, (key, value)|
+            attribute = key.gsub(" ", "").underscore
+            attribute = "original_id" if attribute == "track_id"
+            acc[attribute] = value if whitelist.include? attribute
+            acc
+          end
+
+          # change iTunes' URL-style locations into simple paths
+          if attributes["location"] && attributes["location"] =~ /^file:\/\//
+            attributes["location"].sub! /^file:\/\/localhost/, ""
+
+            # CGI::unescape changes plus signs to spaces. This is a work around to
+            # keep the plus signs.
+            attributes["location"].gsub! "+", "%2B"
+
+            attributes["location"] = CGI::unescape(attributes["location"])
+          end
+
+          track = tracks.new(attributes)
+
+          if track.kind =~ /audio/
+            if track.save
+              num_tracks += 1
+            end
+          else
+            logger.("[skipping non-audio file]") if logger
+          end
+        end
+        logger.("Imported #{num_tracks} tracks successfully.") if logger
+
+        logger.("Importing #{data['Playlists'].length} playlists...") if logger
+        num_playlists = 0
+        data["Playlists"].each do |playlist_data|
+          playlist = []
+          playlist.name = playlist_data["Name"]
+
+          if ["Library", "Music", "Movies", "TV Shows", "iTunes DJ"].include? playlist.name
+            logger.("[skipping \"#{playlist.name}\" playlist]") if logger
+          else
+            playlist_data["Playlist Items"].map(&:values).flatten.each do |original_id|
+              playlist << tracks.where(original_id: original_id).first
+            end
+            playlist.compact!
+            save_playlist playlist
+            num_playlists += 1
+          end
+        end
+        logger.("Imported #{num_playlists} playlists successfully.") if logger
+      end
+    end
   end
 end

data/lib/listlace/player.rb

@@ -1,19 +1,27 @@
-require "listlace/player/mplayer"
-
 module Listlace
-  # This is the music box. It contains a queue, which is an array of tracks. It
-  # then plays these tracks sequentially. The buttons for play, pause, next,
-  # previous, etc. are all located here.
+  # This is the music box. It plays playlists. It contains a queue, which is
+  # just a playlist. To tell it what to play, you add one or more playlists to
+  # the queue, then start playing using the start method.
+  #
+  # Playback commands like pause, resume, seek, and so on are delegated to the
+  # SinglePlayer, which takes care of playing each individual song.
+  #
+  # Each method that performs an action is like a button on a physical media
+  # player: you can press the buttons even if they aren't applicable to the
+  # current state of the player. If that's the case, the methods wil return
+  # false. Otherwise, they'll return a truthy value.
   class Player
+    DEFAULT_SINGLE_PLAYER = SinglePlayers::MPlayer
+
     attr_reader :current_track, :current_track_index, :repeat_mode
 
     def initialize
-      @mplayer = nil
+      @single_player = DEFAULT_SINGLE_PLAYER.new
       @queue = []
       @queue.name = :queue
       @current_track = nil
       @current_track_index = nil
-      @paused = false
+      @playlist_paused = false
       @started = false
       @repeat_mode = false
     end
@@ -34,14 +42,19 @@ module Listlace
       stop
       @queue.clear
       @queue.name = :queue
+      true
     end
 
     def empty?
       @queue.empty?
     end
 
+    def playlist_paused?
+      @playlist_paused
+    end
+
     def paused?
-      @paused
+      playlist_paused? or @single_player.paused?
     end
 
     def started?
@@ -51,36 +64,36 @@ module Listlace
     def start
       unless empty?
         @started = true
+        @playlist_paused = false
         @current_track = @queue.first
         @current_track_index = 0
-        load_track(@current_track)
+        play_track @current_track
+        true
+      else
+        false
       end
     end
 
     def stop
-      @mplayer.quit if @mplayer
-      @mplayer = nil
+      @single_player.stop
       @current_track = nil
       @current_track_index = nil
-      @paused = false
+      @playlist_paused = false
       @started = false
+      true
     end
 
     def pause
-      if not paused?
-        @paused = true
-        @mplayer.command "pause"
-      end
+      @single_player.pause
     end
 
     def resume
-      if paused?
-        @paused = false
-        if @mplayer && @mplayer.alive?
-          @mplayer.command "pause"
-        else
-          load_track @current_track
-        end
+      if playlist_paused?
+        play_track @current_track
+        @playlist_paused = false
+        true
+      else
+        @single_player.resume
       end
     end
 
@@ -93,6 +106,7 @@ module Listlace
       when :off
         @repeat_mode = false
       end
+      true
     end
 
     def restart
@@ -104,41 +118,47 @@ module Listlace
     end
 
     def skip(n = 1)
-      @current_track.increment! :skip_count
-      @current_track.update_column :skip_date, Time.now
+      if @current_track
+        @current_track.increment! :skip_count
+        @current_track.update_column :skip_date, Time.now
+      end
       change_track(n)
     end
 
     def seek(where)
-      case where
-      when Integer
-        @mplayer.command("seek %d 0" % [where], expect_answer: true)
-      when Range
-        @mplayer.command("seek %d 2" % [where.begin * 60 + where.end], expect_answer: true)
-      when String
-        @mplayer.command("seek %d 2" % [Track.parse_time(where) / 1000], expect_answer: true)
-      when Hash
-        if where[:abs]
-          if where[:abs].is_a? Integer
-            @mplayer.command("seek %d 2" % [where[:abs]], expect_answer: true)
-          else
-            seek(where[:abs])
+      if playlist_paused?
+        resume
+        pause
+        seek where
+      else
+        case where
+        when Integer
+          @single_player.seek(where, :relative)
+        when Range
+          seconds = where.begin * 60 + where.end
+          @single_player.seek(seconds * 1000, :absolute)
+        when String
+          @single_player.seek(Track.parse_time(where), :absolute)
+        when Hash
+          if where[:abs]
+            if where[:abs].is_a? Integer
+              @single_player.seek(where[:abs], :absolute)
+            else
+              seek(where[:abs])
+            end
+          elsif where[:percent]
+            @single_player.seek(where[:percent], :percent)
           end
-        elsif where[:percent]
-          @mplayer.command("seek %d 1" % [where[:percent]], expect_answer: true)
         end
       end
     end
 
     def speed
-      answer = @mplayer.command("get_property speed", expect_answer: true)
-      if answer =~ /^ANS_speed=([0-9.]+)$/
-        $1.to_f
-      end
+      @single_player.active? ? @single_player.speed : 1.0
     end
 
-    def set_speed(speed)
-      @mplayer.command("speed_set %f" % [speed], expect_answer: true)
+    def speed=(new_speed)
+      @single_player.speed(new_speed)
     end
 
     def shuffle
@@ -148,21 +168,19 @@ module Listlace
       else
         @queue.shuffle!
       end
+      true
     end
 
     def sort(&by)
       @queue.sort! &by
-
       if started?
         @current_track_index = @queue.index(@current_track)
       end
+      true
     end
 
     def current_time
-      answer = @mplayer.command "get_time_pos", expect_answer: true
-      if answer =~ /^ANS_TIME_POSITION=([0-9.]+)$/
-        ($1.to_f * 1000).to_i
-      end
+      @single_player.active? ? @single_player.current_time : 0
     end
 
     def formatted_current_time
@@ -172,39 +190,46 @@ module Listlace
     private
 
     def change_track(by = 1, options = {})
-      if options[:auto]
-        @current_track.increment! :play_count
-        @current_track.update_column :play_date_utc, Time.now
-      end
-      @current_track_index += by
-      if options[:auto] && @repeat_mode
-        case @repeat_mode
-        when :one
-          @current_track_index -= by
-        when :all
-          if @current_track_index >= @queue.length
-            @current_track_index = 0
+      if started?
+        if options[:auto]
+          @current_track.increment! :play_count
+          @current_track.update_column :play_date_utc, Time.now
+        end
+        @current_track_index += by
+        if options[:auto] && @repeat_mode
+          case @repeat_mode
+          when :one
+            @current_track_index -= by
+          when :all
+            if @current_track_index >= @queue.length
+              @current_track_index = 0
+            end
           end
         end
-      end
-      @current_track = @queue[@current_track_index]
-      if @current_track && @current_track_index >= 0
-        if paused?
-          @mplayer.quit if @mplayer
+        @current_track = @queue[@current_track_index]
+        if @current_track && @current_track_index >= 0
+          if @single_player.paused?
+            @single_player.stop
+            @playlist_paused = true
+          elsif not playlist_paused?
+            play_track @current_track
+          end
         else
-          load_track(@current_track)
+          stop
         end
         true
       else
-        stop
         false
       end
     end
 
-    def load_track(track)
-      @mplayer.quit if @mplayer
-      @mplayer = MPlayer.new(track) { send(:change_track, 1, auto: true) }
-      @paused = false
+    def play_track(track)
+      @single_player.play(track) do
+        change_track(1, auto: true)
+        ActiveRecord::Base.connection.close if defined?(ActiveRecord)
+      end
+      @playlist_paused = false
+      true
     end
   end
 end

data/lib/listlace/single_player.rb

@@ -0,0 +1,74 @@
+module Listlace
+  # A SinglePlayer takes care of playing a single track, and controlling the
+  # playback with commands like pause, resume, seek, and so on. It typically
+  # starts an external audio player process to do this job. This class is an
+  # interface that is to be implemented for different audio players. Then the
+  # user can choose which SinglePlayer to use based on what audio players they
+  # have installed.
+  #
+  # All methods that perform an action should return false if the action isn't
+  # applicable, and return a truthy value otherwise.
+  class SinglePlayer
+    # Returns true if a track is currently loaded, i.e. either playing or
+    # paused.
+    def active?
+      raise NotImplementedError
+    end
+
+    # Returns true if a track is loaded and is paused.
+    def paused?
+      raise NotImplementedError
+    end
+
+    # Begin playing a track. The track should respond to #location, which is the
+    # path where the audio file is located. The &on_end callback will be called
+    # when the track is finished playing.
+    def play(track, &on_end)
+      raise NotImplementedError
+    end
+
+    # Stop playback. Typically quits the external audio player process.
+    def stop
+      raise NotImplementedError
+    end
+
+    # Pauses playback.
+    def pause
+      raise NotImplementedError
+    end
+
+    # Resumes playback.
+    def resume
+      raise NotImplementedError
+    end
+
+    # Seek to a particular position in the track. Different types can be
+    # supported, such as absolute, relative, or percent. All times are specified
+    # in milliseconds. A NotImplementedError is raised when a certain type isn't
+    # supported.
+    def seek(where, type = :absolute)
+      case type
+      when :absolute
+        raise NotImplementedError
+      when :relative
+        raise NotImplementedError
+      when :perent
+        raise NotImplementedError
+      else
+        raise NotImplementedError
+      end
+    end
+
+    # Gets or sets the playback speed. If a new speed is passed as an argument,
+    # it sets it to that speed. The speed is a multiplier. For example, for
+    # double speed you'd call speed(2) and for half-speed you'd call speed(0.5).
+    def speed(new_speed = nil)
+      raise NotImplementedError
+    end
+
+    # Returns the current time into the song, in milliseconds.
+    def current_time
+      raise NotImplementedError
+    end
+  end
+end

data/lib/listlace/single_players/mplayer.rb

@@ -0,0 +1,144 @@
+module Listlace
+  module SinglePlayers
+    class MPlayer < SinglePlayer
+      def initialize
+        @active = false
+        @paused = false
+      end
+
+      def active?
+        @active
+      end
+
+      def paused?
+        @paused
+      end
+
+      def play(track, &on_end)
+        _quit
+
+        if File.exists? track.location
+          cmd = ["mplayer", "-slave", "-quiet", track.location]
+          @pid, @stdin, @stdout, @stderr = Open4.popen4(*cmd)
+
+          until @stdout.gets["playback"]
+          end
+
+          @active = true
+          @paused = false
+
+          @quit_hook_active = false
+          @quit_hook = Thread.new do
+            Process.wait(@pid)
+            @quit_hook_active = true
+            @active = false
+            on_end.call
+          end
+
+          true
+        else
+          false
+        end
+      end
+
+      def stop
+        _quit
+      end
+
+      def pause
+        if not @paused
+          _command "pause"
+        else
+          false
+        end
+      end
+
+      def resume
+        if @paused
+          _command "pause"
+        else
+          false
+        end
+      end
+
+      def seek(where, type = :absolute)
+        seconds = where.to_f / 1000
+        case type
+        when :absolute
+          _command "seek #{seconds} 2", expect_answer: true
+        when :relative
+          _command "seek #{seconds} 0", expect_answer: true
+        when :percent
+          _command "seek #{where} 1", expect_answer: true
+        else
+          raise NotImplementedError
+        end
+      end
+
+      def speed(new_speed = nil)
+        if new_speed
+          answer = _command "speed_set #{new_speed.to_f}", expect_answer: true
+          !!answer
+        else
+          answer = _command "get_property speed", expect_answer: true
+          if answer && answer =~ /^ANS_speed=([0-9.]+)$/
+            $1.to_f
+          else
+            false
+          end
+        end
+      end
+
+      def current_time
+        answer = _command "get_time_pos", expect_answer: true
+        if answer && answer =~ /^ANS_TIME_POSITION=([0-9.]+)$/
+          ($1.to_f * 1000).to_i
+        else
+          false
+        end
+      end
+
+      private
+
+      def _command(cmd, options = {})
+        if _alive? and active?
+          if cmd == "pause"
+            @paused = !@paused
+          elsif @paused
+            cmd = "pausing #{cmd}"
+          end
+
+          @stdin.puts cmd
+
+          if options[:expect_answer]
+            answer = "\n"
+            answer = @stdout.gets.sub("\e[A\r\e[K", "") while answer == "\n"
+            answer
+          else
+            true
+          end
+        else
+          false
+        end
+      end
+
+      def _quit
+        if _alive?
+          @quit_hook.kill unless @quit_hook_active
+          _command "quit"
+          @active = false
+          @paused = false
+        end
+        true
+      end
+
+      def _alive?
+        return false if @pid.nil?
+        Process.getpgid(@pid)
+        true
+      rescue Errno::ESRCH
+        false
+      end
+    end
+  end
+end

data/lib/listlace.rb

@@ -1,15 +1,25 @@
 require "open4"
-require "shellwords"
 require "active_record"
 require "fileutils"
 require "plist"
 require "active_support/core_ext/string"
 
-require "listlace/array_ext"
+require "listlace/core_ext/array"
+
+require "listlace/models/track"
+require "listlace/models/playlist"
+require "listlace/models/playlist_item"
+
 require "listlace/library"
+require "listlace/library/database"
+require "listlace/library/selectors"
+
+require "listlace/single_player"
+require "listlace/single_players/mplayer"
 require "listlace/player"
-require "listlace/commands"
-require "listlace/models"
+
+require "listlace/commands/library_commands"
+require "listlace/commands/player_commands"
 
 module Listlace
   extend Listlace::Library::Selectors

data/listlace.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = "listlace"
-  s.version = "0.0.6"
-  s.date = "2012-08-31"
+  s.version = "0.0.7"
+  s.date = "2012-09-03"
   s.summary = "A music player in a REPL."
   s.description = "Listlace is a music player which is interacted with through a Ruby REPL."
   s.author = "Jeremy Ruten"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: listlace
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-31 00:00:00.000000000 Z
+date: 2012-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -137,19 +137,18 @@ files:
 - README.md
 - README.old
 - bin/listlace
-- lib/listlace/array_ext.rb
 - lib/listlace/commands/library_commands.rb
 - lib/listlace/commands/player_commands.rb
-- lib/listlace/commands.rb
+- lib/listlace/core_ext/array.rb
 - lib/listlace/library/database.rb
 - lib/listlace/library/selectors.rb
 - lib/listlace/library.rb
 - lib/listlace/models/playlist.rb
 - lib/listlace/models/playlist_item.rb
 - lib/listlace/models/track.rb
-- lib/listlace/models.rb
-- lib/listlace/player/mplayer.rb
 - lib/listlace/player.rb
+- lib/listlace/single_player.rb
+- lib/listlace/single_players/mplayer.rb
 - lib/listlace.rb
 homepage: http://github.com/yjerem/listlace
 licenses:

data/lib/listlace/commands.rb

@@ -1,7 +0,0 @@
-require "listlace/commands/library_commands"
-require "listlace/commands/player_commands"
-
-module Listlace
-  module Commands
-  end
-end

data/lib/listlace/models.rb

@@ -1,3 +0,0 @@
-require "listlace/models/track"
-require "listlace/models/playlist"
-require "listlace/models/playlist_item"

data/lib/listlace/player/mplayer.rb

@@ -1,53 +0,0 @@
-module Listlace
-  class Player
-    # This is a simple MPlayer wrapper, it just handles opening the MPlayer
-    # process, hooking into when mplayer exits (when the song is done), and
-    # issuing commands through the slave protocol.
-    class MPlayer
-      def initialize(track, &on_quit)
-        cmd = "/usr/bin/mplayer -slave -quiet #{Shellwords.shellescape(track.location)}"
-        @pid, @stdin, @stdout, @stderr = Open4.popen4(cmd)
-        @paused = false
-        @extra_lines = 0
-
-        until @stdout.gets["playback"]
-        end
-
-        @quit_hook_active = false
-        @quit_hook = Thread.new do
-          Process.wait(@pid)
-          @quit_hook_active = true
-          on_quit.call
-        end
-      end
-
-      def command(cmd, options = {})
-        if cmd == "pause"
-          @paused = !@paused
-        elsif @paused
-          cmd = "pausing #{cmd}"
-        end
-
-        @stdin.puts cmd
-
-        if options[:expect_answer]
-          answer = "\n"
-          answer = @stdout.gets.sub("\e[A\r\e[K", "") while answer == "\n"
-          answer
-        end
-      end
-
-      def quit
-        @quit_hook.kill unless @quit_hook_active
-        command "quit" if alive?
-      end
-
-      def alive?
-        Process.getpgid(@pid)
-        true
-      rescue Errno::ESRCH
-        false
-      end
-    end
-  end
-end