ampv 1.0.0 → 1.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTMwNzg3MDNhNjM2ZTk1Njk4MmYyNzllNTYzOTQ4MzQ1OTJiNmJkOQ==
+    MGJiNjBmNmVlNzNlZGVkYjc5ZWYyZTY0ZjI0ZjdkYjA1ZTU4Yjc4YQ==
   data.tar.gz: !binary |-
-    MmFmYTY5YmQ4Zjc0OTQ4NzE3Y2IxNTBmNmZhNGQ5ZTc5M2E5NDBiMQ==
+    NDkzNzZkNmY4ZTViYmQ3NTliNWY4YThkNzY3MGI2NzU0NzEwYzJkYg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YzFkNDdmOTYyOTg1NDdkNjEyZTgwN2NlY2Y0NzU3MjkzODE2OTQ1YWFjZDNm
-    ZTJlMWQyNTUwNTc5ZTVjZTFlZjEzZGZmMjMzY2E1MTRmZDZmOWQ2YzE3MjUx
-    NmU0ZTQyNzA2YWMzMjU2MGI5YzRiMmJjMjk5YjJhYTJmNDcxMDM=
+    MWYwZjE4ZGY5ZjFkNTg1ZjY1MmI3YmQ2MGY0ODM5ODNjZWM5NzgzMzEyMTEy
+    ZjIxMWI2Mzk1NjI4MWI0NjliZDY3MzMyZTFjZDYxM2FiNzA2ZTFhMmZjODky
+    MjA4YzJjYjVkYWIzOGI1OTAwNmViZGRkODIwMzEyZGM1OGYzZWE=
   data.tar.gz: !binary |-
-    MzE0ZjZhZGYyYzhkNWZmNjhiZDA1ZjAyNDBlMmVmMDQyYWVhNGZkOTk4YmQw
-    MWJiMDU0ZGNmYzBjMDIyNzg1OWI3NDE0MWM1Zjk3ZTgwMzRkY2VlOTE1ZWJj
-    OWNiMjZkOTYzY2YxOWEwMGZiMmZlN2RkYzdiNWQxODYxZTZkZjU=
+    OTNiYmQyNDIyZjUxMjBjODY2NjdmZTIxNmUwYjE4MzYxZDQ0MTZhYmJiNWFh
+    NDIyMDY2YmMyMDc1NzZkODgxNGU5M2RiNGYyODM2YzRmOWUxZmI5YTBhNmNk
+    ZmY4YWQzMDY3NjZjM2Q1YWU1ODllOGRmYzc4ZjcwMWEyODA3Yzk=

data/lib/ampv.rb

@@ -106,7 +106,7 @@ module Ampv
                                             @config["progress_bar_height"])
       @progress_bar.add_events(Gdk::Event::BUTTON_PRESS_MASK)
       @progress_bar.signal_connect("button_press_event") { |w, e| handle_seek_event(e) }
-      vbox.pack_start(@progress_bar, false, false)
+      vbox.pack_start(@progress_bar, false)
 
       show_all
       @mpv.start

data/lib/ampv/mpvwidget.rb

@@ -39,8 +39,7 @@ module Ampv
           --input-file=#{@mpv_fifo} \
           --no-mouse-movements \
           --cursor-autohide=no \
-          --msglevel=all=2 \
-          --msglevel=global=4 \
+          --msglevel=all=info:global=info \
           --wid=#{@socket.id} #{@mpv_options}"
         @thread = Thread.new { slave_reader(cmd) }
       end
@@ -101,17 +100,17 @@ module Ampv
       scrobbled = false
       watched = 0
 
-      while true
+      loop {
         send("get_property time-pos") unless @is_paused
 
-        if not @scrobbler.nil? and not scrobbled and watched >= @length * 0.5
+        unless @scrobbler.nil? or scrobbled or watched < @length * 0.5
           system("#{@scrobbler} \"#{@playing}\"")
           scrobbled = true
         end
 
         sleep(1)
         watched += 1 unless @is_paused
-      end
+      }
     end
 
     def signal_do_file_changed(file) end

data/lib/ampv/progressbarwidget.rb

@@ -4,7 +4,7 @@ module Ampv
     def initialize(bar_color, head_color, height)
       super()
       modify_bg(Gtk::STATE_NORMAL, Gdk::Color.parse("#000"))
-      set_height_request(height)
+      set_size_request(-1, height)
 
       signal_connect("expose_event") {
         @cx = window.create_cairo_context
@@ -17,12 +17,12 @@ module Ampv
 
     def draw_widget
       @cx.set_source_color(@bar_color)
-      @cx.rectangle(0, 0, allocation.width * @value.to_f, allocation.height)
+      @cx.rectangle(0, 0, (allocation.width * @value.to_f).round, allocation.height)
       @cx.fill
 
       if @value > 0
         @cx.set_source_color(@head_color)
-        @cx.rectangle(allocation.width * @value.to_f, 0, 2, allocation.height)
+        @cx.rectangle((allocation.width * @value.to_f).round, 0, 2, allocation.height)
         @cx.fill
       end
     end

data/lib/ampv/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ampv
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - ahoka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-28 00:00:00.000000000 Z
+date: 2013-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk2
@@ -47,10 +47,10 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - input.conf
-- lib/ampv/version.rb
 - lib/ampv/playlist.rb
 - lib/ampv/progressbarwidget.rb
 - lib/ampv/mpvwidget.rb
+- lib/ampv/version.rb
 - lib/ampv.rb
 - bin/ampv
 homepage: https://github.com/ahodesuka/ampv
@@ -73,6 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - gtk2
+- mpv
 rubyforge_project: 
 rubygems_version: 2.0.3
 signing_key: