ampv 1.1.0 → 1.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTI1MjM3YjlmNDJhZTdlMTdjOTY4MWU5YjMwZTdkZDZmYmJlNjMwYg==
+    NDlmNGYzOTM1YzRmYTQ2ZmI4MDkzZjhjYWQ4ODgwMDlkNjU4YjU5MQ==
   data.tar.gz: !binary |-
-    ZGFjZTg2ZGRiZDI1NDY0MTAwNmRjY2Y1M2MzODY5YmIxZTJkYmY4Yg==
+    M2ZlYmE2N2QxZGIxNmJjNmYxMjc4ZTgzMTg5N2U5ZTQyNjkyM2ZiMQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZTA5ZjMxMTEzNjVhMWY2NGFkZWUwNjJiZmQ4ZjBkZDVjOTg5ZTdjZGMwZDBl
-    MWZmZmVlYTIzY2M0ZGM4ZjhiZGU2NTdkZTE2ZWYxNzc3ZDQyMDdmOGFjNzQ1
-    ODU5ZTJjYjMwMTYyMTBmNmQ2Yzk2ZWJkMzJiNTk5ZDBhZmI5Yjk=
+    NDMyMTlkZDc0NTk5YTIzOGRjOGJhZDRkYzlkNjFiM2NkYzI2ZGY2MGE5ZTBk
+    Mzc5YzkzYWQ0MGNjMDMxZTQyNzdlOGZhZjVhYmZiMzg2MDlmMTFmYjdjN2Jk
+    NTk0ZGU1ZWQ0MTg2MTZjZjc5OWQ2MmZkMjJhMWY5ODI1OTczNTU=
   data.tar.gz: !binary |-
-    YWIzYWM1YWI2ZDU2OGQ2NGZiYjE3MzUyNzQ1YmQwZDYzZjQ5MzE4MjQ4Njcx
-    MzA2MmQyMGM3NDUyMmM3YzdlY2E0OWYyNzYwOTQ3YzhkODU1YTVjZDg3ZjNl
-    YTk4MzMxNjA2YzI3N2IzMWZiMTBkNjgyODg0NjU4YmI4NzZiMmI=
+    YmYwZDRiYWQyNjg0NTM5Y2JkNGY5NzZjY2Y4MjVmOGI3ODRjOWQyMzU0MmEx
+    MWUwZjEwZDdlZWVlMTEwZTc2OTFmMWY0MzI4YTc5OTFmYmI2NjVhYzlhMTVi
+    MDY0N2MxMzI2MTY5MTAxMGNkMWI5YTE3ZDBlOWM2NDFlZGQ2YmM=

data/lib/ampv.rb

@@ -131,7 +131,11 @@ module Ampv
         end
       elsif Config["playlist"].length > 0
         Config["playlist"].each { |x| @playlist.add_file(x["file"], x["length"], x["watched"]) }
-        @playlist.set_selected(Config["playlist_selected"])
+        if Config["resume_playback"]
+          @mpv.load_file(Config["playlist_selected"])
+        else
+          @playlist.set_selected(Config["playlist_selected"])
+        end
       end
 
       Gtk.main
@@ -299,6 +303,7 @@ module Ampv
       Config["playlist_visible"]     = @playlist.visible?
       Config["playlist_selected"]    = @playing
       Config["playlist"]             = @playlist.get_entries.to_json
+      Config["resume_playback"]      = !@mpv.is_stopped && (watch_later || Config["always_save_position"])
       Config["progress_bar_visible"] = @progress_bar.visible?
       Config.save
 

data/lib/ampv/config.rb

@@ -35,6 +35,7 @@ module Ampv
         "playlist_y"             => 0,
         "playlist_visible"       => true,
         "always_save_position"   => false,
+        "resume_playback"        => false,
         "scrobbler"              => "",
         "playlist_selected"      => "",
         "playlist"               => [ ],

data/lib/ampv/mpvwidget.rb

@@ -18,7 +18,7 @@ module Ampv
       end
     }
 
-    attr_reader :is_paused
+    attr_reader :is_paused, :is_stopped
 
     def initialize(args)
       if args.include?("--debug")
@@ -35,7 +35,10 @@ module Ampv
 
       @socket = Gtk::Socket.new
       @socket.modify_bg(Gtk::STATE_NORMAL, Gdk::Color.parse("#000"))
-      @socket.signal_connect("plug_removed") { signal_emit("stopped"); true }
+      @socket.signal_connect("plug_removed") {
+        signal_emit("stopped")
+        @is_stopped = true
+      }
 
       add(@socket)
     end
@@ -56,13 +59,13 @@ module Ampv
 
     def stop
       send("stop")
-      @is_paused = true
+      @is_stopped = @is_paused = true
     end
 
     def quit(watch_later)
       send("quit" + (watch_later ? "_watch_later" : ""))
-      @thread.kill if @thread
       @prog_thread.kill if @prog_thread
+      @thread.join
       @fifo.close
     end
 
@@ -89,6 +92,7 @@ module Ampv
               send("get_property length")
               send("get_property time-pos")
               send("get_property pause")
+              @is_stopped = false
             elsif line.start_with?("ANS_length=")
               signal_emit("length_changed", (@length = line.rpartition("=")[-1].to_i))
             elsif line.start_with?("ANS_pause=")

data/lib/ampv/version.rb

@@ -1,5 +1,5 @@
 module Ampv
   PACKAGE = "ampv"
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ampv
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - ahoka
@@ -61,11 +61,11 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - input.conf
-- lib/ampv/config.rb
 - lib/ampv/playlist.rb
 - lib/ampv/version.rb
-- lib/ampv/progressbarwidget.rb
 - lib/ampv/mpvwidget.rb
+- lib/ampv/progressbarwidget.rb
+- lib/ampv/config.rb
 - lib/ampv.rb
 - bin/ampv
 homepage: https://github.com/ahodesuka/ampv