ampv 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65f13c0d7f38f560c3937579e6d4339b09fafac8
-  data.tar.gz: 2d6455627b9afe91aa9eb0a1a1672c4c60bb0e21
+  metadata.gz: 4cd792f9c7d994f5be1035bcbced7c95df683908
+  data.tar.gz: a16d8998f82dfd65d0611ee602447adbc6fb6c95
 SHA512:
-  metadata.gz: ea8edc45f06b2c3ab8b9eb45adc6e04f9fb9b6ef71de5b62b87abf93c70181234cc8c62b838f0c1bd9f1ab824eb749fc8f0dc07f79b87e33002c402fc3e588d1
-  data.tar.gz: 3d6a353dac2ab859dd2dbf1f81ff721a1f56fcf811b543494d357dfff9b13be22e88d743ef87d78cd4057fe088a2e0db82e2d7fe0fb3c2cb28b32fc1b0f04cec
+  metadata.gz: d5c646276dece49053e5ee73dceb67c2de4ce4485ba014c261701798ea9234ce66b68e23f970703e5d2c79ee5c9f7b14c2f3592be418611badfdb8239622747d
+  data.tar.gz: 8d0e88a8409d93bf33271abf62ca452af5e6296e47d5310007dad00e069e731a04c6284c1bf7772bf91acf7f19848c4bfa0f53599a13ea4d09dfaea8dd8b6170

data/lib/ampv.rb

@@ -19,9 +19,6 @@ module Ampv
       Gdk::EventScroll::RIGHT => 7
     }
 
-    LEFT_PTR     = Gdk::Cursor.new(Gdk::Cursor::LEFT_PTR)
-    BLANK_CURSOR = Gdk::Cursor.new(Gdk::Cursor::BLANK_CURSOR)
-
     def initialize
       unless defined?(MpvWidget::PATH)
         dlg = Gtk::MessageDialog.new(nil,
@@ -60,6 +57,7 @@ module Ampv
         files = sd.uris.map { |f| URI.decode(f).sub(/^file:\/\/[^\/]*/, "") }
         @playlist.clear(true) unless @playlist.get_files & files == files
         load_files(files)
+        present
         Gtk::Drag.finish(dc, true, false, time)
       }
       signal_connect("motion_notify_event") { mouse_cursor_timeout }
@@ -68,22 +66,10 @@ module Ampv
       @mpv          = MpvWidget.new(args)
       @progress_bar = ProgressBarWidget.new
       @playlist     = Playlist.new
-      @ignore_stop  = false
 
       @mpv.signal_connect("file_changed") { |w, file|
         @playing = URI.decode(file).sub(/^file:\/\/[^\/]*/, "")
-        # hacky work around when mpv catches drag and drop events.
-        unless @playlist.include?(@playing)
-          @playlist.clear(true)
-          if (file = create_playlist(@playing)) != @playing and File.directory?(@playing)
-            @playing = file
-            GLib::Idle.add { @mpv.load_file(@playing); false }
-            # mpv will fail to play the directory and then stop
-            # ignore the next stop event so the playlist does not advance
-            @ignore_stop = true
-          end
-        end
-        @mpv.send("show_text ${media-title} 1500") if window.state.fullscreen? and !@ignore_stop
+        @mpv.send("show_text ${media-title} 1500") if window.state.fullscreen?
         @playlist.set_selected(@playing)
         set_title(File.basename(@playing))
       }
@@ -93,22 +79,21 @@ module Ampv
       @mpv.signal_connect("stopped") {
         @progress_bar.value = 0
         set_title(PACKAGE)
-        unless @ignore_stop
-          next_file = @playlist.get_next
-          @really_stop ||= next_file.nil?
-          if !@really_stop
-            @mpv.load_file(next_file)
-          else
-            @playlist.playing_stopped
-            toggle_fullscreen if window.state.fullscreen?
-          end
+        next_file = @playlist.get_next
+        @really_stop ||= next_file.nil?
+        if !@really_stop
+          @mpv.load_file(next_file)
+        else
+          @playlist.playing_stopped
+          toggle_fullscreen if window.state.fullscreen?
         end
-        @really_stop = @ignore_stop = false
+        @really_stop = false
       }
 
       @playlist.signal_connect("open_file_chooser") { open_file_chooser }
       @playlist.signal_connect("drag_data_received") { |w, dc, x, y, sd, type, time|
         sd.uris.each { |f| @playlist.add_file(URI.decode(f).sub(/^file:\/\/[^\/]*/, "")) }
+        present
         Gtk::Drag.finish(dc, true, false, time)
       }
       @playlist.signal_connect("play_entry") { |w, file| @mpv.load_file(file, true) }
@@ -178,10 +163,12 @@ module Ampv
     end
 
     def handle_mouse_event(e)
+      if e.event_type != Gdk::Event::MOTION_NOTIFY
+        button = e.event_type == Gdk::Event::SCROLL ? WHEEL_BUTTONS[e.direction] : e.button
+        return if Config["mouse_bindings"][e.event_type].nil?
+        process_cmd(Config["mouse_bindings"][e.event_type][button])
+      end
       mouse_cursor_timeout
-      button = e.event_type == Gdk::Event::SCROLL ? WHEEL_BUTTONS[e.direction] : e.button
-      return if Config["mouse_bindings"][e.event_type].nil?
-      process_cmd(Config["mouse_bindings"][e.event_type][button])
     end
 
     def handle_keyboard_event(e)
@@ -196,11 +183,12 @@ module Ampv
     end
 
     def mouse_cursor_timeout
-      window.set_cursor(LEFT_PTR)
+      window.set_cursor(nil)
       GLib::Source.remove(@cursor_timeout) if @cursor_timeout
       @cursor_timeout = GLib::Timeout.add(1000) {
-        window.set_cursor(BLANK_CURSOR)
-      } unless @mpv.is_paused
+        window.set_cursor(Gdk::Cursor.new(Gdk::Cursor::BLANK_CURSOR)) unless @mpv.is_paused
+        false
+      }
     end
 
     def process_cmd(cmd)

data/lib/ampv/mpvwidget.rb

@@ -31,16 +31,12 @@ module Ampv
       @is_paused   = true
 
       super()
-      signal_connect("realize") { start }
 
-      @socket = Gtk::Socket.new
-      @socket.modify_bg(Gtk::STATE_NORMAL, Gdk::Color.parse("#000"))
-      @socket.signal_connect("plug_removed") {
-        signal_emit("stopped")
-        @is_stopped = true
-      }
+      @widget = Gtk::DrawingArea.new
+      @widget.modify_bg(Gtk::STATE_NORMAL, Gdk::Color.parse("#000"))
+      @widget.signal_connect("realize") { start }
 
-      add(@socket)
+      add(@widget)
     end
 
     def send(cmd)
@@ -81,13 +77,13 @@ module Ampv
         --cursor-autohide=no \
         --no-mouse-movements \
         --msglevel=all=info \
-        --wid=#{@socket.id} #{@mpv_options}"
+        --wid=#{@widget.window.xid} #{@mpv_options}"
 
       @thread = Thread.start {
         IO.popen(cmd) { |io|
           io.each { |line|
             line.chomp!
-            if line.include?("Playing: ")
+            if line.start_with?("Playing: ")
               signal_emit("file_changed", (@playing = line.partition("Playing: ")[-1]))
               send("get_property length")
               send("get_property time-pos")
@@ -102,6 +98,9 @@ module Ampv
               play_pause if @force_play and @is_paused
             elsif line.start_with?("ANS_time-pos=")
               signal_emit("time_pos_changed", line.rpartition("=")[-1].to_f)
+            elsif line == "Creating non-video VO window."
+              signal_emit("stopped")
+              @is_stopped = true
             end
 
             puts(line) if @debug and !line.start_with?("ANS_")
@@ -114,7 +113,7 @@ module Ampv
       scrobbled = false
       watched = 0
       loop {
-        send("get_property time-pos") unless @is_paused
+        send("get_property time-pos")
         unless scrobbled or watched < @length * 0.5
           system("#{Config["scrobbler"]} \"#{@playing}\"") if Config["scrobbler"]
           signal_emit("playing_watched")

data/lib/ampv/playlist.rb

@@ -42,11 +42,11 @@ module Ampv
       vbox.border_width = 10
       sw.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC)
 
-      @treeview.enable_search  = false
-      @treeview.rubber_banding = true
-      @treeview.reorderable = true
-      @treeview.selection.mode = Gtk::SELECTION_MULTIPLE
-      @treeview.tooltip_column = 0
+      @treeview.set_enable_search (false)
+      @treeview.set_rubber_banding(true)
+      @treeview.set_reorderable(true)
+      @treeview.set_tooltip_column(0)
+      @treeview.selection.set_mode(Gtk::SELECTION_MULTIPLE)
 
       @treeview.signal_connect("row_activated") { |w, p, c|
         signal_emit("play_entry", @model.get_iter(p)[0])
@@ -55,7 +55,11 @@ module Ampv
         remove_selected if e.keyval == Gdk::Keyval::GDK_Delete
       }
       @treeview.signal_connect("button_press_event") { |w, e|
-        @menu.popup(nil, nil, e.button, e.time) if e.event_type == Gdk::Event::BUTTON_PRESS and e.button == 3
+        if e.event_type == Gdk::Event::BUTTON_PRESS and e.button == 3
+          path = @treeview.get_path(e.x, e.y)[0]
+          @treeview.set_cursor(path, nil, false) if path
+          @menu.popup(nil, nil, e.button, e.time)
+        end
       }
 
       ["Name", "Length"].each_with_index { |x, i|

data/lib/ampv/version.rb

@@ -1,5 +1,5 @@
 module Ampv
   PACKAGE = "ampv"
-  VERSION = "1.1.3"
+  VERSION = "1.2.0"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ampv
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - ahoka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-08 00:00:00.000000000 Z
+date: 2014-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk2
@@ -62,9 +62,9 @@ files:
 - LICENSE
 - input.conf
 - lib/ampv/mpvwidget.rb
-- lib/ampv/playlist.rb
 - lib/ampv/progressbarwidget.rb
 - lib/ampv/config.rb
+- lib/ampv/playlist.rb
 - lib/ampv/version.rb
 - lib/ampv.rb
 - bin/ampv