diff options
| author | Pootle daemon <pootle@pootle.sugarlabs.org> | 2012-08-23 04:32:13 (GMT) |
|---|---|---|
| committer | Pootle daemon <pootle@pootle.sugarlabs.org> | 2012-08-23 04:32:13 (GMT) |
| commit | c0038475a122a8297a7dae19630c95d6d83de486 (patch) | |
| tree | 0063f991e242ceaf42865e3fc794e8c3375ece16 | |
| parent | 8d3850c8544344905016747d09ebf8e5a77aa1b3 (diff) | |
| parent | 32e1688db1dc45f9ed75d844ff7b651d835cfd44 (diff) | |
Merge branch 'master' of git.sugarlabs.org:jukebox/mainline
| -rw-r--r-- | activity/activity.info | 3 | ||||
| -rw-r--r-- | jukeboxactivity.py | 18 |
2 files changed, 11 insertions, 10 deletions
diff --git a/activity/activity.info b/activity/activity.info index 7cef463..12b8332 100644 --- a/activity/activity.info +++ b/activity/activity.info @@ -6,5 +6,4 @@ icon = activity-jukebox exec = sugar-activity jukeboxactivity.JukeboxActivity show_launcher = yes activity_version = 27 -mime_types = video/x-theora;audio/x-vorbis;audio/x-flac;audio/x-speex;application/x-ogm-video;application/x-ogm-audio;video/x-mng;audio/x-aiff;audio/x-wav;audio/x-m4a;video/mpeg4;video/mpeg-stream;video/mpeg;application/ogg;video/mpegts;video/mpeg2;video/mpeg1;audio/mpeg;audio/x-ac3;video/x-cdxa;audio/x-au;audio/mpegurl;audio/x-mpegurl;audio/x-vorbis+ogg;audio/x-scpls;audio/ogg;video/ogg;audio/x-flac+ogg;audio/x-speex+ogg;video/x-theora+ogg;video/x-ogm+ogg;video/x-flv;video/mp4;video/x-matroska;video/x-msvideo; - +mime_types = video/x-theora;audio/x-vorbis;audio/x-flac;audio/x-speex;application/x-ogm-video;application/x-ogm-audio;video/x-mng;audio/x-aiff;audio/x-wav;audio/x-m4a;video/mpeg4;video/mpeg-stream;video/mpeg;application/ogg;video/mpegts;video/mpeg2;video/mpeg1;audio/mpeg;audio/x-ac3;video/x-cdxa;audio/x-au;audio/mpegurl;audio/x-mpegurl;audio/x-vorbis+ogg;audio/x-scpls;audio/ogg;video/ogg;audio/x-flac+ogg;audio/x-speex+ogg;video/x-theora+ogg;video/x-ogm+ogg;video/x-flv;video/mp4;video/x-matroska;video/x-msvideo;video/quicktime, video/x-quicktime, image/mov, audio/aiff, audio/x-midi, video/avi diff --git a/jukeboxactivity.py b/jukeboxactivity.py index a84f9af..aebbc98 100644 --- a/jukeboxactivity.py +++ b/jukeboxactivity.py @@ -21,7 +21,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA - +import sys import logging import tempfile from gettext import gettext as _ @@ -866,20 +866,22 @@ class VideoWidget(Gtk.DrawingArea): if __name__ == '__main__': window = Gtk.Window() - view = VideoWidget() - #view.set_file_location(sys.argv[1]) - - player = GstPlayer(view) #player.connect("eos", self._player_eos_cb) #player.connect("error", self._player_error_cb) #player.connect("tag", self._player_new_tag_cb) #player.connect("stream-info", self._player_stream_info_cb) - + view.show() window.add(view) - player.set_uri('http://78.46.73.237:8000/prog') - player.play() + def map_cb(widget): + player = GstPlayer(view) + player.set_uri(sys.argv[1]) + player.play() + + window.connect('map', map_cb) + window.maximize() window.show_all() + window.connect("destroy", Gtk.main_quit) Gtk.main() |