ampv 1.0.2 → 1.0.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +8 -8
- data/lib/ampv.rb +22 -3
- data/lib/ampv/mpvwidget.rb +6 -2
- data/lib/ampv/playlist.rb +0 -4
- data/lib/ampv/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
OTU4NTMxOTlmYWI1Mzc3ODkxYTIwNDc2YmViYzhjZGYxNzY4MWUzZg==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
NTgzOTFhM2Q3MzZjNmE5YjdlMTVhMDliYzlmYjIyODEwZDNhODUzOA==
|
7
7
|
!binary "U0hBNTEy":
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
MDJmODI2YmZiMWMzNmFiMmVkY2Y1N2U1OTQwNjQxMWViNTc2YmE1NTM3ZmIy
|
10
|
+
MjQyYWQ1MWNhNDNmNGQzNmZkMzBhOTJmNzhhNDZlZWFjMzNkMjQ4ZDlkNjIz
|
11
|
+
YTI1MjllMmFiMzIwMWIzNDA3MWQ4Y2VhODk1ODZkOGVkODQwYzY=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
YzU4MDcwMjg1MDg4N2UyMjQ0YjU4ODI5ODA4YTJjZjkzZTY5ZDk1ZGZlZjdm
|
14
|
+
MzkwMzlkZTRiYzM1ZjgyMTg4MmVkZmY5NDk3ZTJmNzM2ZmQxYmVhYzE2ZGM0
|
15
|
+
MGU1ZGM5NjQyOTQ1NjJjYjFmZDY1M2ZjYTBjODVkMmQ4OWEyZWM=
|
data/lib/ampv.rb
CHANGED
@@ -47,6 +47,7 @@ module Ampv
|
|
47
47
|
Gtk::Drag.dest_set(self, Gtk::Drag::DEST_DEFAULT_ALL,
|
48
48
|
[ [ "text/uri-list", 0, 0 ] ],
|
49
49
|
Gdk::DragContext::ACTION_LINK)
|
50
|
+
add_events(Gdk::Event::POINTER_MOTION_MASK)
|
50
51
|
|
51
52
|
signal_connect("delete_event") { quit }
|
52
53
|
signal_connect("scroll_event") { |w, e| handle_mouse_event(e) }
|
@@ -55,14 +56,22 @@ module Ampv
|
|
55
56
|
signal_connect("drag_data_received") { |w, dc, x, y, sd, type, time|
|
56
57
|
handle_drop_event(sd.data, dc, time, false, true)
|
57
58
|
}
|
59
|
+
signal_connect("motion_notify_event") {
|
60
|
+
window.set_cursor(LEFT_PTR)
|
61
|
+
GLib::Source.remove(@cursor_timeout) if @cursor_timeout
|
62
|
+
@cursor_timeout = GLib::Timeout.add(1000) {
|
63
|
+
window.set_cursor(BLANK_CURSOR)
|
64
|
+
} unless @mpv.is_paused
|
65
|
+
}
|
58
66
|
|
59
67
|
vbox = Gtk::VBox.new
|
60
68
|
add(vbox)
|
61
69
|
|
62
70
|
args = process_args
|
71
|
+
print_version if args.include?("--version")
|
63
72
|
load_bindings
|
64
73
|
|
65
|
-
@mpv =
|
74
|
+
@mpv = MpvWidget.new(args, @config["scrobbler"])
|
66
75
|
@mpv.signal_connect("file_changed") { |w, file|
|
67
76
|
@playing = file
|
68
77
|
@mpv.send("show_text ${media-title} 1500") if window.state.fullscreen?
|
@@ -94,6 +103,11 @@ module Ampv
|
|
94
103
|
@config["playlist_width"],
|
95
104
|
@config["playlist_height"],
|
96
105
|
@config["playlist_visible"])
|
106
|
+
|
107
|
+
Gtk::Drag.dest_set(@playlist, Gtk::Drag::DEST_DEFAULT_ALL,
|
108
|
+
[ [ "text/uri-list", 0, 0 ] ],
|
109
|
+
Gdk::DragContext::ACTION_LINK)
|
110
|
+
|
97
111
|
@playlist.signal_connect("open_file_chooser") { open_file_chooser }
|
98
112
|
@playlist.signal_connect("drag_data_received") { |w, dc, x, y, sd, type, time|
|
99
113
|
handle_drop_event(sd.data, dc, time, true, false)
|
@@ -308,11 +322,9 @@ module Ampv
|
|
308
322
|
if window.state.fullscreen?
|
309
323
|
@progress_bar.show unless @progress_bar_user_hidden
|
310
324
|
unfullscreen
|
311
|
-
window.set_cursor(LEFT_PTR)
|
312
325
|
else
|
313
326
|
@progress_bar.hide unless @config["fullscreen_progressbar"]
|
314
327
|
fullscreen
|
315
|
-
window.set_cursor(BLANK_CURSOR)
|
316
328
|
end
|
317
329
|
end
|
318
330
|
|
@@ -357,6 +369,13 @@ module Ampv
|
|
357
369
|
dialog.destroy
|
358
370
|
end
|
359
371
|
|
372
|
+
def print_version
|
373
|
+
puts("#{PACKAGE} - v#{VERSION}\n" +
|
374
|
+
"ruby #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} (#{RUBY_RELEASE_DATE} revision #{RUBY_REVISION}) [#{RUBY_PLATFORM}]\n\n" +
|
375
|
+
`#{MpvWidget::PATH} --version`)
|
376
|
+
exit
|
377
|
+
end
|
378
|
+
|
360
379
|
def quit(watch_later=false)
|
361
380
|
@config["x"],
|
362
381
|
@config["y"],
|
data/lib/ampv/mpvwidget.rb
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
require "fifo"
|
2
2
|
|
3
3
|
module Ampv
|
4
|
-
class
|
4
|
+
class MpvWidget < Gtk::EventBox
|
5
5
|
|
6
6
|
type_register
|
7
7
|
signal_new("file_changed", GLib::Signal::RUN_FIRST, nil, nil, String)
|
@@ -9,6 +9,10 @@ module Ampv
|
|
9
9
|
signal_new("time_pos_changed", GLib::Signal::RUN_FIRST, nil, nil, Float)
|
10
10
|
signal_new("stopped", GLib::Signal::RUN_FIRST, nil, nil)
|
11
11
|
|
12
|
+
PATH = "/usr/bin/mpv"
|
13
|
+
|
14
|
+
attr_reader :is_paused
|
15
|
+
|
12
16
|
def initialize(args, scrobbler)
|
13
17
|
if args.include?("--debug")
|
14
18
|
args.delete("--debug")
|
@@ -39,7 +43,7 @@ module Ampv
|
|
39
43
|
--input-file=#{@mpv_fifo} \
|
40
44
|
--no-mouse-movements \
|
41
45
|
--cursor-autohide=no \
|
42
|
-
--msglevel=all=info
|
46
|
+
--msglevel=all=info \
|
43
47
|
--wid=#{@socket.id} #{@mpv_options}"
|
44
48
|
@thread = Thread.new { slave_reader(cmd) }
|
45
49
|
end
|
data/lib/ampv/playlist.rb
CHANGED
@@ -23,10 +23,6 @@ module Ampv
|
|
23
23
|
set_skip_taskbar_hint(true)
|
24
24
|
move(x, y)
|
25
25
|
|
26
|
-
Gtk::Drag.dest_set(self, Gtk::Drag::DEST_DEFAULT_ALL,
|
27
|
-
[ [ "text/uri-list", 0, 0 ] ],
|
28
|
-
Gdk::DragContext::ACTION_LINK)
|
29
|
-
|
30
26
|
signal_connect("show") { move(@pos[0], @pos[1]) unless @pos.nil? }
|
31
27
|
signal_connect("hide") { @pos = window.root_origin }
|
32
28
|
signal_connect("delete_event") { hide_on_delete }
|
data/lib/ampv/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ampv
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.
|
4
|
+
version: 1.0.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- ahoka
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2013-12-
|
11
|
+
date: 2013-12-30 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: gtk2
|
@@ -48,9 +48,9 @@ files:
|
|
48
48
|
- LICENSE
|
49
49
|
- input.conf
|
50
50
|
- lib/ampv/playlist.rb
|
51
|
-
- lib/ampv/progressbarwidget.rb
|
52
51
|
- lib/ampv/mpvwidget.rb
|
53
52
|
- lib/ampv/version.rb
|
53
|
+
- lib/ampv/progressbarwidget.rb
|
54
54
|
- lib/ampv.rb
|
55
55
|
- bin/ampv
|
56
56
|
homepage: https://github.com/ahodesuka/ampv
|