summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjaseg <code@jaseg.net>2017-08-03 00:53:27 +0200
committerjaseg <code@jaseg.net>2017-08-03 00:53:27 +0200
commite0591798f287b730a3dcb829ed9bcfbaaf4ae51f (patch)
tree7e93652d55a3cebbef9a3603997387fe4cf674a2
parent5b3dedc3096bfd59ca6d38b61cb6b665ad5df3eb (diff)
downloadpython-mpv-e0591798f287b730a3dcb829ed9bcfbaaf4ae51f.tar.gz
python-mpv-e0591798f287b730a3dcb829ed9bcfbaaf4ae51f.tar.bz2
python-mpv-e0591798f287b730a3dcb829ed9bcfbaaf4ae51f.zip
Fixes for libmpv v0.26.0
-rwxr-xr-xmpv-test.py10
-rw-r--r--mpv.py7
2 files changed, 12 insertions, 5 deletions
diff --git a/mpv-test.py b/mpv-test.py
index e607071..dc66f74 100755
--- a/mpv-test.py
+++ b/mpv-test.py
@@ -135,8 +135,8 @@ class TestProperties(unittest.TestCase):
self.m[name]
def test_multivalued_option(self):
- self.m['external-file'] = ['test.webm', b'test.webm']
- self.assertEqual(self.m['external-file'], [b'test.webm', b'test.webm'])
+ self.m['external-files'] = ['test.webm', b'test.webm']
+ self.assertEqual(self.m['external-files'], [b'test.webm', b'test.webm'])
class ObservePropertyTest(unittest.TestCase):
@@ -228,7 +228,7 @@ class TestLifecycle(unittest.TestCase):
def test_flags(self):
with self.assertRaises(AttributeError):
mpv.MPV('this-option-does-not-exist')
- m = mpv.MPV('no-video', 'cursor-autohide-fs-only', 'fs')
+ m = mpv.MPV('cursor-autohide-fs-only', 'fs', video=False)
self.assertTrue(m.fullscreen)
self.assertEqual(m.cursor_autohide, '1000')
m.terminate()
@@ -244,7 +244,7 @@ class TestLifecycle(unittest.TestCase):
def test_event_callback(self):
handler = mock.Mock()
- m = mpv.MPV('no-video')
+ m = mpv.MPV(video=False)
m.register_event_callback(handler)
m.play(TESTVID)
m.wait_for_playback()
@@ -262,7 +262,7 @@ class TestLifecycle(unittest.TestCase):
def test_log_handler(self):
handler = mock.Mock()
- m = mpv.MPV('no-video', log_handler=handler)
+ m = mpv.MPV(video=False, log_handler=handler)
m.play(TESTVID)
m.wait_for_playback()
m.terminate()
diff --git a/mpv.py b/mpv.py
index 889811c..ae200e2 100644
--- a/mpv.py
+++ b/mpv.py
@@ -1120,6 +1120,12 @@ ALL_PROPERTIES = {
'tv-contrast': (int, 'rw'),
'tv-saturation': (int, 'rw'),
'tv-hue': (int, 'rw'),
+ 'tv-freq': (float, 'rw'),
+ 'tv-norm': (str, 'rw'),
+ 'tv-scan': (bool, 'rw'),
+ 'tv-channel': (str, 'rw'),
+ 'dvb-channel': (_node, 'rw'),
+ 'dvb-channel-name': (str, 'rw'),
'playlist-pos': (int, 'rw'),
'playlist-pos-1': (int, 'rw'), # ugh.
'playlist-count': (int, 'r'),
@@ -1201,6 +1207,7 @@ ALL_PROPERTIES = {
'af': (_node, 'r', True),
'options': (_node, 'r', True),
'file-local-options': (_node, 'r', True),
+ 'vo-passes': (_node, 'r', True),
'property-list': (_commalist,'r')}
def _bindproperty(MPV, name, proptype, access, decode_str=False):