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
=== modified file 'Audience/Audience.vala'
--- Audience/Audience.vala 2013-07-22 06:00:31 +0000
+++ Audience/Audience.vala 2013-11-24 08:16:46 +0000
@@ -266,7 +266,10 @@
266266
267 //end267 //end
268 video_player.ended.connect ( () => {268 video_player.ended.connect ( () => {
269 playlist.next ();269 Idle.add (()=>{
270 playlist.next ();
271 return false;
272 });
270 });273 });
271274
272 /*open location popover*/275 /*open location popover*/
273276
=== modified file 'Audience/Widgets/VideoPlayer.vala'
--- Audience/Widgets/VideoPlayer.vala 2013-05-19 17:10:26 +0000
+++ Audience/Widgets/VideoPlayer.vala 2013-11-24 08:16:46 +0000
@@ -127,6 +127,7 @@
127 127
128 intial_relayout = true;128 intial_relayout = true;
129 129
130 playing = false;
130 playbin.set_state (Gst.State.READY);131 playbin.set_state (Gst.State.READY);
131 playbin.suburi = null;132 playbin.suburi = null;
132 subtitle_uri = null;133 subtitle_uri = null;
@@ -136,6 +137,7 @@
136 at_end = false;137 at_end = false;
137 138
138 relayout ();139 relayout ();
140 playing = true;
139 }141 }
140 }142 }
141 143

Subscribers

People subscribed via source and target branches