ampv 1.1.2 → 1.1.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/ampv.rb +4 -7
- data/lib/ampv/playlist.rb +10 -2
- data/lib/ampv/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 65f13c0d7f38f560c3937579e6d4339b09fafac8
|
4
|
+
data.tar.gz: 2d6455627b9afe91aa9eb0a1a1672c4c60bb0e21
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: ea8edc45f06b2c3ab8b9eb45adc6e04f9fb9b6ef71de5b62b87abf93c70181234cc8c62b838f0c1bd9f1ab824eb749fc8f0dc07f79b87e33002c402fc3e588d1
|
7
|
+
data.tar.gz: 3d6a353dac2ab859dd2dbf1f81ff721a1f56fcf811b543494d357dfff9b13be22e88d743ef87d78cd4057fe088a2e0db82e2d7fe0fb3c2cb28b32fc1b0f04cec
|
data/lib/ampv.rb
CHANGED
@@ -98,8 +98,9 @@ module Ampv
|
|
98
98
|
@really_stop ||= next_file.nil?
|
99
99
|
if !@really_stop
|
100
100
|
@mpv.load_file(next_file)
|
101
|
-
|
102
|
-
|
101
|
+
else
|
102
|
+
@playlist.playing_stopped
|
103
|
+
toggle_fullscreen if window.state.fullscreen?
|
103
104
|
end
|
104
105
|
end
|
105
106
|
@really_stop = @ignore_stop = false
|
@@ -126,11 +127,7 @@ module Ampv
|
|
126
127
|
show_all
|
127
128
|
|
128
129
|
if !files.empty?
|
129
|
-
|
130
|
-
load_files(files)
|
131
|
-
else
|
132
|
-
load_file(files[0], false)
|
133
|
-
end
|
130
|
+
load_files(files)
|
134
131
|
elsif Config["playlist"].length > 0
|
135
132
|
Config["playlist"].each { |x| @playlist.add_file(x["file"], x["length"], x["watched"]) }
|
136
133
|
if Config["resume_playback"]
|
data/lib/ampv/playlist.rb
CHANGED
@@ -144,7 +144,7 @@ module Ampv
|
|
144
144
|
entries << {
|
145
145
|
"file" => iter[0],
|
146
146
|
"length" => iter[1] ? iter[1] : "",
|
147
|
-
"watched" =>
|
147
|
+
"watched" => iter[2] == WATCHED_PIXBUF || (iter == @playing_iter && @current_is_watched)
|
148
148
|
}
|
149
149
|
}
|
150
150
|
entries
|
@@ -159,6 +159,7 @@ module Ampv
|
|
159
159
|
def clear(quiet = false)
|
160
160
|
@model.clear
|
161
161
|
signal_emit("playing_removed") unless quiet or @playing_iter.nil?
|
162
|
+
@playing_iter = nil
|
162
163
|
end
|
163
164
|
|
164
165
|
def set_selected(file)
|
@@ -180,6 +181,10 @@ module Ampv
|
|
180
181
|
}
|
181
182
|
end
|
182
183
|
|
184
|
+
def playing_stopped
|
185
|
+
@playing_iter[2] = nil if @playing_iter and @playing_iter[2] == PLAYING_PIXBUF
|
186
|
+
end
|
187
|
+
|
183
188
|
def update_length(length)
|
184
189
|
return if length == 0
|
185
190
|
@playing_iter[1] = Time.at(length).utc.strftime("%H:%M:%S") if @playing_iter
|
@@ -210,7 +215,10 @@ module Ampv
|
|
210
215
|
to_remove << @model.get_iter(path)
|
211
216
|
}
|
212
217
|
to_remove.each { |iter|
|
213
|
-
|
218
|
+
if iter == @playing_iter
|
219
|
+
@playing_iter = nil
|
220
|
+
signal_emit("playing_removed")
|
221
|
+
end
|
214
222
|
@model.remove(iter)
|
215
223
|
}
|
216
224
|
end
|
data/lib/ampv/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ampv
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.1.
|
4
|
+
version: 1.1.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- ahoka
|
@@ -62,9 +62,9 @@ files:
|
|
62
62
|
- LICENSE
|
63
63
|
- input.conf
|
64
64
|
- lib/ampv/mpvwidget.rb
|
65
|
+
- lib/ampv/playlist.rb
|
65
66
|
- lib/ampv/progressbarwidget.rb
|
66
67
|
- lib/ampv/config.rb
|
67
|
-
- lib/ampv/playlist.rb
|
68
68
|
- lib/ampv/version.rb
|
69
69
|
- lib/ampv.rb
|
70
70
|
- bin/ampv
|