ampv 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 943c6cc8f359174b3bf8d5c51c38761dacf1523b
-  data.tar.gz: 8a2c814830826c6c8f3c698bd1f8ec0ab7a1cde5
+  metadata.gz: 8c53292e5b30740dc7acb2f2c636b3a9f10d8461
+  data.tar.gz: 2878f0245d381052d5926d47d5a65866024e7186
 SHA512:
-  metadata.gz: 081a7c98b93fad0f3604c8f1de457b9966477562941db6093954a1dffd5749fa9e3dd4eb7ea8bafa17e32a42b95c8d86e3c50061e2ce0fd383cc94f816b8c928
-  data.tar.gz: 3bed50ec7e8b7b2150321d2a7970c6eca6069de872869cc854c1b052658e31e77d7f2036ff066d348ec11cee5cb36f21f4a12b4edec14c154455e504ed62be5b
+  metadata.gz: 18e14e349249708b0c2b647288918c8b94c7d578e7818692113f5a3e4efbab548712bf05dbe05ca504a0983e4ebb2bf6e741f1ffc40c6abe4be09d3cf7dd37b4
+  data.tar.gz: 6ca3f6b671aa8ffae1e6a2262a3b5f6bd87e0ae6bca3e3b729beadf42ae50a3d746241743b65b6535d9e32e44e94c5cd09d09785f66946e2c4875b264234ddad

data/lib/ampv.rb

@@ -75,6 +75,10 @@ module Ampv
       }
       @mpv.signal_connect("playing_watched") { @playlist.on_playing_watched }
       @mpv.signal_connect("length_changed") { |w, len| @playlist.update_length(@length = len) }
+      @mpv.signal_connect("title_changed") { |w, t|
+        @playlist.update_title(t)
+        set_title(t)
+      }
       @mpv.signal_connect("time_pos_changed") { |w, pos| @progress_bar.value = pos / @length.to_f }
       @mpv.signal_connect("stopped") {
         @progress_bar.value = 0
@@ -122,6 +126,7 @@ module Ampv
         end
       end
 
+      mouse_cursor_timeout
       Gtk.main
     end
 
@@ -135,7 +140,7 @@ module Ampv
 
       return unless File.directory?(file) or valid_video_file?(file) or uri
 
-      if @playlist.count == 0 and auto_add
+      if @playlist.count == 0 and auto_add and !uri
         file = create_playlist(file)
       elsif !@playlist.include?(file)
         @playlist.add_file(file)
@@ -184,7 +189,7 @@ module Ampv
       GLib::Source.remove(@cursor_timeout) if @cursor_timeout
       window.set_cursor(nil)
       @cursor_timeout = GLib::Timeout.add(1000) {
-        window.set_cursor(Gdk::Cursor.new(Gdk::Cursor::BLANK_CURSOR)) unless @mpv.is_paused
+        window.set_cursor(Gdk::Cursor.new(Gdk::Cursor::BLANK_CURSOR))
         # hacky workaround when called after a mouse event
         # without this the cursor is still shown when it should not be.
         Gdk::Display.default.warp_pointer(*Gdk::Display.default.pointer[0..2]) if mevent
@@ -240,7 +245,6 @@ module Ampv
         @progress_bar.hide unless Config["fullscreen_progressbar"]
         fullscreen
       end
-      mouse_cursor_timeout
     end
 
     def toggle_progress_bar

data/lib/ampv/mpvwidget.rb

@@ -1,4 +1,3 @@
-require "fifo"
 require "tmpdir"
 
 module Ampv
@@ -7,6 +6,7 @@ module Ampv
     type_register
     signal_new("file_changed", GLib::Signal::RUN_FIRST, nil, nil, String)
     signal_new("length_changed", GLib::Signal::RUN_FIRST, nil, nil, Integer)
+    signal_new("title_changed", GLib::Signal::RUN_FIRST, nil, nil, String)
     signal_new("playing_watched", GLib::Signal::RUN_FIRST, nil, nil)
     signal_new("time_pos_changed", GLib::Signal::RUN_FIRST, nil, nil, Float)
     signal_new("stopped", GLib::Signal::RUN_FIRST, nil, nil)
@@ -40,7 +40,8 @@ module Ampv
     end
 
     def send(cmd)
-      @fifo.puts(cmd) if @fifo
+      @fifo.puts(cmd)
+      @fifo.flush
     end
 
     def load_file(file, force_play = false)
@@ -68,7 +69,8 @@ module Ampv
   private
     def start
       return if @thread and @thread.alive?
-      @fifo = Fifo.new(@mpv_fifo, :w, :nowait)
+      system("mkfifo \"#{@mpv_fifo}\"")
+      @fifo = File.open(@mpv_fifo, "w+")
       ObjectSpace.define_finalizer(self, proc { File.delete(@mpv_fifo) })
 
       cmd = "#{PATH} \
@@ -85,10 +87,13 @@ module Ampv
             line.chomp!
             if line.start_with?("Playing: ")
               signal_emit("file_changed", (@playing = line.partition("Playing: ")[-1]))
+              send("get_property media-title")
               send("get_property length")
               send("get_property time-pos")
               send("get_property pause")
               @is_stopped = false
+            elsif line.start_with?("ANS_media-title=")
+              signal_emit("title_changed", line.rpartition("=")[-1])
             elsif line.start_with?("ANS_length=")
               signal_emit("length_changed", (@length = line.rpartition("=")[-1].to_i))
             elsif line.start_with?("ANS_pause=")
@@ -126,6 +131,7 @@ module Ampv
 
     def signal_do_file_changed(file) end
     def signal_do_length_changed(len) end
+    def signal_do_title_changed(title) end
     def signal_do_playing_watched; end
     def signal_do_time_pos_changed(pos) end
     def signal_do_stopped

data/lib/ampv/playlist.rb

@@ -32,6 +32,7 @@ module Ampv
         hide_on_delete if e.keyval == Gdk::Keyval::GDK_Escape
       }
 
+      @titles   = Hash.new
       vbox      = Gtk::VBox.new(false, 10)
       sw        = Gtk::ScrolledWindow.new
       @model    = Gtk::ListStore.new(String, String, Gdk::Pixbuf)
@@ -69,7 +70,11 @@ module Ampv
           renderer.ellipsize = Pango::ELLIPSIZE_MIDDLE
           column.expand = true
           column.set_cell_data_func(renderer) { |t, c, m, j|
-            c.text = File.basename(m.get_value(j, 0)) unless m.get_value(j, 0).nil?
+            if @titles[j[0]]
+              c.text = @titles[j[0]]
+            else
+              c.text = File.basename(j[0])
+            end
           }
         end
 
@@ -161,6 +166,7 @@ module Ampv
     end
 
     def clear(quiet = false)
+      @titles.clear
       @model.clear
       signal_emit("playing_removed") unless quiet or @playing_iter.nil?
       @playing_iter = nil
@@ -194,6 +200,11 @@ module Ampv
       @playing_iter[1] = Time.at(length).utc.strftime("%H:%M:%S") if @playing_iter
     end
 
+    def update_title(title)
+      return unless title
+      @titles[@playing_iter[0]] = title
+    end
+
   private
     def move_selected_up
       @treeview.selection.selected_rows.each { |path|
@@ -223,6 +234,7 @@ module Ampv
           @playing_iter = nil
           signal_emit("playing_removed")
         end
+        @titles.delete(iter[0])
         @model.remove(iter)
       }
     end

data/lib/ampv/version.rb

@@ -1,5 +1,5 @@
 module Ampv
   PACKAGE = "ampv"
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ampv
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - ahoka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-21 00:00:00.000000000 Z
+date: 2014-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk2
@@ -38,20 +38,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby-fifo
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: A minimal GTK2 mpv frontend.
 email: 
 executables:
@@ -61,11 +47,11 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - input.conf
-- lib/ampv/playlist.rb
+- lib/ampv/mpvwidget.rb
 - lib/ampv/progressbarwidget.rb
 - lib/ampv/config.rb
 - lib/ampv/version.rb
-- lib/ampv/mpvwidget.rb
+- lib/ampv/playlist.rb
 - lib/ampv.rb
 - bin/ampv
 homepage: https://github.com/ahodesuka/ampv
@@ -89,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - mpv v0.3.x
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: ampv