diff --git a/doc/sources/images/videoplayer-annotation.jpg b/doc/sources/images/videoplayer-annotation.jpg index 0c5b4d319..cc8c97444 100644 Binary files a/doc/sources/images/videoplayer-annotation.jpg and b/doc/sources/images/videoplayer-annotation.jpg differ diff --git a/examples/demo/kivycatalog/container_kvs/MediaContainer.kv b/examples/demo/kivycatalog/container_kvs/MediaContainer.kv index fd5590691..395f2c978 100644 --- a/examples/demo/kivycatalog/container_kvs/MediaContainer.kv +++ b/examples/demo/kivycatalog/container_kvs/MediaContainer.kv @@ -3,7 +3,7 @@ BoxLayout: orientation: "vertical" Image: - source: "../../widgets/softboy.png" + source: "../../widgets/cityCC0.png" Video: - source: "../../widgets/softboy.mpg" + source: "../../widgets/cityCC0.mpg" state: "play" diff --git a/examples/demo/kivycatalog/container_kvs/ScatterContainer.kv b/examples/demo/kivycatalog/container_kvs/ScatterContainer.kv index 3b94f6124..aa668ee45 100644 --- a/examples/demo/kivycatalog/container_kvs/ScatterContainer.kv +++ b/examples/demo/kivycatalog/container_kvs/ScatterContainer.kv @@ -6,7 +6,7 @@ FloatLayout: size: 100, 100 pos: 100, 100 Image: - source: "../../widgets/softboy.png" + source: "../../widgets/cityCC0.png" Scatter: size_hint: None, None size: 100, 100 diff --git a/examples/kv/app_logo.kv b/examples/kv/app_logo.kv index 687b97dbe..5a223b20e 100644 --- a/examples/kv/app_logo.kv +++ b/examples/kv/app_logo.kv @@ -1,7 +1,7 @@ Widget: Video: id: myvideo - source: '../widgets/softboy.mpg' + source: '../widgets/cityCC0.mpg' play: mybutton.state == 'down' canvas: Color: diff --git a/examples/kv/app_video.kv b/examples/kv/app_video.kv index 4f54c9265..a358019d4 100644 --- a/examples/kv/app_video.kv +++ b/examples/kv/app_video.kv @@ -6,7 +6,7 @@ BoxLayout: Video: id: myvideo - source: '../widgets/softboy.avi' + source: '../widgets/cityCC0.mpg' allow_stretch: True on_eos: self.play = True; print('woot we are looping!') diff --git a/examples/widgets/softboy.jsa b/examples/widgets/cityCC0.jsa similarity index 100% rename from examples/widgets/softboy.jsa rename to examples/widgets/cityCC0.jsa diff --git a/examples/widgets/cityCC0.mpg b/examples/widgets/cityCC0.mpg new file mode 100644 index 000000000..626b342ee Binary files /dev/null and b/examples/widgets/cityCC0.mpg differ diff --git a/examples/widgets/cityCC0.png b/examples/widgets/cityCC0.png new file mode 100644 index 000000000..3b91d9e3e Binary files /dev/null and b/examples/widgets/cityCC0.png differ diff --git a/examples/widgets/rstexample.py b/examples/widgets/rstexample.py index c3b211aa4..0bfaa01d8 100644 --- a/examples/widgets/rstexample.py +++ b/examples/widgets/rstexample.py @@ -8,7 +8,7 @@ And if i really want to write my code: &bl; Hello world &br; And video widget ---------------- -.. video:: softboy.mpg +.. video:: cityCC0.mpg Inline Markup diff --git a/examples/widgets/softboy.mpg b/examples/widgets/softboy.mpg deleted file mode 100644 index ac76e15b6..000000000 Binary files a/examples/widgets/softboy.mpg and /dev/null differ diff --git a/examples/widgets/softboy.png b/examples/widgets/softboy.png deleted file mode 100644 index 809484729..000000000 Binary files a/examples/widgets/softboy.png and /dev/null differ diff --git a/examples/widgets/tabbed_panel_showcase.py b/examples/widgets/tabbed_panel_showcase.py index 33bcfed4e..20f5cf4fc 100644 --- a/examples/widgets/tabbed_panel_showcase.py +++ b/examples/widgets/tabbed_panel_showcase.py @@ -212,7 +212,7 @@ Builder.load_string(''' id: tab_3_content pos:self.parent.pos size: self.parent.size - source: 'softboy.mpg' + source: 'cityCC0.mpg' TabbedPanelHeader: id: def_tab content:default_content.__self__ diff --git a/examples/widgets/videoplayer.py b/examples/widgets/videoplayer.py index 4c30804e3..6eeafc796 100644 --- a/examples/widgets/videoplayer.py +++ b/examples/widgets/videoplayer.py @@ -18,7 +18,7 @@ class VideoPlayerApp(App): filename = argv[1] else: curdir = dirname(__file__) - filename = join(curdir, 'softboy.mpg') + filename = join(curdir, 'cityCC0.mpg') return VideoPlayer(source=filename, state='play') diff --git a/kivy/tests/test_video.py b/kivy/tests/test_video.py index db8f5b3ec..2ddf02c6c 100644 --- a/kivy/tests/test_video.py +++ b/kivy/tests/test_video.py @@ -13,7 +13,7 @@ class AnimationTestCase(unittest.TestCase): from os.path import join, dirname, abspath here = dirname(__file__) source = abspath(join( - here, "..", "..", "examples", "widgets", "softboy.mpg")) + here, "..", "..", "examples", "widgets", "cityCC0.mpg")) video = Video(source=source, play=True) Clock.schedule_once(lambda x: stopTouchApp(), 1) diff --git a/kivy/uix/videoplayer.py b/kivy/uix/videoplayer.py index 752a2577d..65f15881e 100644 --- a/kivy/uix/videoplayer.py +++ b/kivy/uix/videoplayer.py @@ -21,7 +21,7 @@ will automatically load the associated annotation file if it exists. An annotation file is JSON-based, providing a list of label dictionary items. The key and value must match one of the :class:`VideoPlayerAnnotation` items. For example, here is a short version of a jsa file that you can find in -`examples/widgets/softboy.jsa`:: +`examples/widgets/cityCC0.jsa`:: [ @@ -32,14 +32,14 @@ For example, here is a short version of a jsa file that you can find in "text": "You can change the background color"} ] -For our softboy.avi example, the result will be: +For our cityCC0.mpg example, the result will be: .. image:: images/videoplayer-annotation.jpg :align: center If you want to experiment with annotation files, test with:: - python -m kivy.uix.videoplayer examples/widgets/softboy.avi + python -m kivy.uix.videoplayer examples/widgets/cityCC0.mpg Fullscreen ----------