ampv 1.0.2 → 1.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGJiNjBmNmVlNzNlZGVkYjc5ZWYyZTY0ZjI0ZjdkYjA1ZTU4Yjc4YQ==
+    OTU4NTMxOTlmYWI1Mzc3ODkxYTIwNDc2YmViYzhjZGYxNzY4MWUzZg==
   data.tar.gz: !binary |-
-    NDkzNzZkNmY4ZTViYmQ3NTliNWY4YThkNzY3MGI2NzU0NzEwYzJkYg==
+    NTgzOTFhM2Q3MzZjNmE5YjdlMTVhMDliYzlmYjIyODEwZDNhODUzOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MWYwZjE4ZGY5ZjFkNTg1ZjY1MmI3YmQ2MGY0ODM5ODNjZWM5NzgzMzEyMTEy
-    ZjIxMWI2Mzk1NjI4MWI0NjliZDY3MzMyZTFjZDYxM2FiNzA2ZTFhMmZjODky
-    MjA4YzJjYjVkYWIzOGI1OTAwNmViZGRkODIwMzEyZGM1OGYzZWE=
+    MDJmODI2YmZiMWMzNmFiMmVkY2Y1N2U1OTQwNjQxMWViNTc2YmE1NTM3ZmIy
+    MjQyYWQ1MWNhNDNmNGQzNmZkMzBhOTJmNzhhNDZlZWFjMzNkMjQ4ZDlkNjIz
+    YTI1MjllMmFiMzIwMWIzNDA3MWQ4Y2VhODk1ODZkOGVkODQwYzY=
   data.tar.gz: !binary |-
-    OTNiYmQyNDIyZjUxMjBjODY2NjdmZTIxNmUwYjE4MzYxZDQ0MTZhYmJiNWFh
-    NDIyMDY2YmMyMDc1NzZkODgxNGU5M2RiNGYyODM2YzRmOWUxZmI5YTBhNmNk
-    ZmY4YWQzMDY3NjZjM2Q1YWU1ODllOGRmYzc4ZjcwMWEyODA3Yzk=
+    YzU4MDcwMjg1MDg4N2UyMjQ0YjU4ODI5ODA4YTJjZjkzZTY5ZDk1ZGZlZjdm
+    MzkwMzlkZTRiYzM1ZjgyMTg4MmVkZmY5NDk3ZTJmNzM2ZmQxYmVhYzE2ZGM0
+    MGU1ZGM5NjQyOTQ1NjJjYjFmZDY1M2ZjYTBjODVkMmQ4OWEyZWM=

data/lib/ampv.rb

@@ -47,6 +47,7 @@ module Ampv
       Gtk::Drag.dest_set(self, Gtk::Drag::DEST_DEFAULT_ALL,
                          [ [ "text/uri-list", 0, 0 ] ],
                          Gdk::DragContext::ACTION_LINK)
+      add_events(Gdk::Event::POINTER_MOTION_MASK)
 
       signal_connect("delete_event") { quit }
       signal_connect("scroll_event") { |w, e| handle_mouse_event(e) }
@@ -55,14 +56,22 @@ module Ampv
       signal_connect("drag_data_received") { |w, dc, x, y, sd, type, time|
         handle_drop_event(sd.data, dc, time, false, true)
       }
+      signal_connect("motion_notify_event") {
+        window.set_cursor(LEFT_PTR)
+        GLib::Source.remove(@cursor_timeout) if @cursor_timeout
+        @cursor_timeout = GLib::Timeout.add(1000) {
+          window.set_cursor(BLANK_CURSOR)
+        } unless @mpv.is_paused
+      }
 
       vbox = Gtk::VBox.new
       add(vbox)
 
       args = process_args
+      print_version if args.include?("--version")
       load_bindings
 
-      @mpv = MPvWidget.new(args, @config["scrobbler"])
+      @mpv = MpvWidget.new(args, @config["scrobbler"])
       @mpv.signal_connect("file_changed") { |w, file|
         @playing = file
         @mpv.send("show_text ${media-title} 1500") if window.state.fullscreen?
@@ -94,6 +103,11 @@ module Ampv
                                @config["playlist_width"],
                                @config["playlist_height"],
                                @config["playlist_visible"])
+
+      Gtk::Drag.dest_set(@playlist, Gtk::Drag::DEST_DEFAULT_ALL,
+                         [ [ "text/uri-list", 0, 0 ] ],
+                         Gdk::DragContext::ACTION_LINK)
+
       @playlist.signal_connect("open_file_chooser") { open_file_chooser }
       @playlist.signal_connect("drag_data_received") { |w, dc, x, y, sd, type, time|
         handle_drop_event(sd.data, dc, time, true, false)
@@ -308,11 +322,9 @@ module Ampv
       if window.state.fullscreen?
         @progress_bar.show unless @progress_bar_user_hidden
         unfullscreen
-        window.set_cursor(LEFT_PTR)
       else
         @progress_bar.hide unless @config["fullscreen_progressbar"]
         fullscreen
-        window.set_cursor(BLANK_CURSOR)
       end
     end
 
@@ -357,6 +369,13 @@ module Ampv
       dialog.destroy
     end
 
+    def print_version
+      puts("#{PACKAGE} - v#{VERSION}\n" +
+           "ruby #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} (#{RUBY_RELEASE_DATE} revision #{RUBY_REVISION}) [#{RUBY_PLATFORM}]\n\n" +
+          `#{MpvWidget::PATH} --version`)
+      exit
+    end
+
     def quit(watch_later=false)
       @config["x"],
       @config["y"],

data/lib/ampv/mpvwidget.rb

@@ -1,7 +1,7 @@
 require "fifo"
 
 module Ampv
-  class MPvWidget < Gtk::EventBox
+  class MpvWidget < Gtk::EventBox
 
     type_register
     signal_new("file_changed", GLib::Signal::RUN_FIRST, nil, nil, String)
@@ -9,6 +9,10 @@ module Ampv
     signal_new("time_pos_changed", GLib::Signal::RUN_FIRST, nil, nil, Float)
     signal_new("stopped", GLib::Signal::RUN_FIRST, nil, nil)
 
+    PATH = "/usr/bin/mpv"
+
+    attr_reader :is_paused
+
     def initialize(args, scrobbler)
       if args.include?("--debug")
         args.delete("--debug")
@@ -39,7 +43,7 @@ module Ampv
           --input-file=#{@mpv_fifo} \
           --no-mouse-movements \
           --cursor-autohide=no \
-          --msglevel=all=info:global=info \
+          --msglevel=all=info \
           --wid=#{@socket.id} #{@mpv_options}"
         @thread = Thread.new { slave_reader(cmd) }
       end

data/lib/ampv/playlist.rb

@@ -23,10 +23,6 @@ module Ampv
       set_skip_taskbar_hint(true)
       move(x, y)
 
-      Gtk::Drag.dest_set(self, Gtk::Drag::DEST_DEFAULT_ALL,
-                         [ [ "text/uri-list", 0, 0 ] ],
-                         Gdk::DragContext::ACTION_LINK)
-
       signal_connect("show") { move(@pos[0], @pos[1]) unless @pos.nil? }
       signal_connect("hide") { @pos = window.root_origin }
       signal_connect("delete_event") { hide_on_delete }

data/lib/ampv/version.rb

@@ -1,6 +1,6 @@
 
 module Ampv
   PACKAGE = "ampv"
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ampv
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - ahoka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-26 00:00:00.000000000 Z
+date: 2013-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk2
@@ -48,9 +48,9 @@ files:
 - LICENSE
 - input.conf
 - lib/ampv/playlist.rb
-- lib/ampv/progressbarwidget.rb
 - lib/ampv/mpvwidget.rb
 - lib/ampv/version.rb
+- lib/ampv/progressbarwidget.rb
 - lib/ampv.rb
 - bin/ampv
 homepage: https://github.com/ahodesuka/ampv