Merge lp:~vikoadi/audience/audience-openanother into lp:~audience-members/audience/trunk

Proposed by Viko Adi Rahmawan
Status: Merged
Approved by: Cody Garver
Approved revision: 302
Merged at revision: 304
Proposed branch: lp:~vikoadi/audience/audience-openanother
Merge into: lp:~audience-members/audience/trunk
Diff against target: 34 lines (+6/-1)
2 files modified
Audience/Audience.vala (+4/-1)
Audience/Widgets/VideoPlayer.vala (+2/-0)
To merge this branch: bzr merge lp:~vikoadi/audience/audience-openanother
Reviewer Review Type Date Requested Status
Tom Beckmann Pending
Review via email: mp+196441@code.launchpad.net

Commit message

Opening another video while playing can freeze audience. These changes set status to READY before changing URI. Opening next video when its over needs to be called using Idle.add.

Description of the change

1.opening another video while playing can freeze audience.
this branch will set status to READY before changing uri
2. opening next video when its over needs to be called using Idle.add

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Audience/Audience.vala'
2--- Audience/Audience.vala 2013-07-22 06:00:31 +0000
3+++ Audience/Audience.vala 2013-11-24 08:16:46 +0000
4@@ -266,7 +266,10 @@
5
6 //end
7 video_player.ended.connect ( () => {
8- playlist.next ();
9+ Idle.add (()=>{
10+ playlist.next ();
11+ return false;
12+ });
13 });
14
15 /*open location popover*/
16
17=== modified file 'Audience/Widgets/VideoPlayer.vala'
18--- Audience/Widgets/VideoPlayer.vala 2013-05-19 17:10:26 +0000
19+++ Audience/Widgets/VideoPlayer.vala 2013-11-24 08:16:46 +0000
20@@ -127,6 +127,7 @@
21
22 intial_relayout = true;
23
24+ playing = false;
25 playbin.set_state (Gst.State.READY);
26 playbin.suburi = null;
27 subtitle_uri = null;
28@@ -136,6 +137,7 @@
29 at_end = false;
30
31 relayout ();
32+ playing = true;
33 }
34 }
35

Subscribers

People subscribed via source and target branches