ampv 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67bcc7597fa24e08ca81a50a2bbb810a95fcf937
-  data.tar.gz: 67c22c9f18bacff3c12a077242db957868967a7a
+  metadata.gz: 65f13c0d7f38f560c3937579e6d4339b09fafac8
+  data.tar.gz: 2d6455627b9afe91aa9eb0a1a1672c4c60bb0e21
 SHA512:
-  metadata.gz: 8311e6dd3454d64619ca7a9f81822f30cd85250e60275d85079b3217fe2c26793e4e822d304c6e1a695892fb590189f9d50764196fd30d1b409011bb952337be
-  data.tar.gz: bdcdcf12923d80c54a19022e7463ea6e2dc80758b789f1f29f5975cf33ec5cdc20c3fb44dc7450121dd8dcb66135d9d58c69281c57dd1f4bfc959e74d92c5c05
+  metadata.gz: ea8edc45f06b2c3ab8b9eb45adc6e04f9fb9b6ef71de5b62b87abf93c70181234cc8c62b838f0c1bd9f1ab824eb749fc8f0dc07f79b87e33002c402fc3e588d1
+  data.tar.gz: 3d6a353dac2ab859dd2dbf1f81ff721a1f56fcf811b543494d357dfff9b13be22e88d743ef87d78cd4057fe088a2e0db82e2d7fe0fb3c2cb28b32fc1b0f04cec

data/lib/ampv.rb

@@ -98,8 +98,9 @@ module Ampv
           @really_stop ||= next_file.nil?
           if !@really_stop
             @mpv.load_file(next_file)
-          elsif window.state.fullscreen?
-            toggle_fullscreen
+          else
+            @playlist.playing_stopped
+            toggle_fullscreen if window.state.fullscreen?
           end
         end
         @really_stop = @ignore_stop = false
@@ -126,11 +127,7 @@ module Ampv
       show_all
 
       if !files.empty?
-        if files.length > 1
-          load_files(files)
-        else
-          load_file(files[0], false)
-        end
+        load_files(files)
       elsif Config["playlist"].length > 0
         Config["playlist"].each { |x| @playlist.add_file(x["file"], x["length"], x["watched"]) }
         if Config["resume_playback"]

data/lib/ampv/playlist.rb

@@ -144,7 +144,7 @@ module Ampv
         entries << {
           "file"    => iter[0],
           "length"  => iter[1] ? iter[1] : "",
-          "watched" => !iter[2].nil?
+          "watched" => iter[2] == WATCHED_PIXBUF || (iter == @playing_iter && @current_is_watched)
         }
       }
       entries
@@ -159,6 +159,7 @@ module Ampv
     def clear(quiet = false)
       @model.clear
       signal_emit("playing_removed") unless quiet or @playing_iter.nil?
+      @playing_iter = nil
     end
 
     def set_selected(file)
@@ -180,6 +181,10 @@ module Ampv
       }
     end
 
+    def playing_stopped
+      @playing_iter[2] = nil if @playing_iter and @playing_iter[2] == PLAYING_PIXBUF
+    end
+
     def update_length(length)
       return if length == 0
       @playing_iter[1] = Time.at(length).utc.strftime("%H:%M:%S") if @playing_iter
@@ -210,7 +215,10 @@ module Ampv
         to_remove << @model.get_iter(path)
       }
       to_remove.each { |iter|
-        signal_emit("playing_removed") if iter == @playing_iter
+        if iter == @playing_iter
+          @playing_iter = nil
+          signal_emit("playing_removed")
+        end
         @model.remove(iter)
       }
     end

data/lib/ampv/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ampv
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - ahoka
@@ -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