Audience

Merge lp:~vikoadi/audience/fix-nonvideo into lp:~audience-members/audience/trunk

  1. fix-nonvideo
  2. Merge into trunk
Proposed by Viko Adi Rahmawan
Status: Merged
Approved by: Cody Garver
Approved revision: 374
Merged at revision: 387
Proposed branch: lp:~vikoadi/audience/fix-nonvideo
Merge into: lp:~audience-members/audience/trunk
Diff against target: 25 lines (+2/-2)
2 files modified
src/Widgets/PreviewPopover.vala (+1/-1)
src/Widgets/VideoPlayer.vala (+1/-1)
To merge this branch: bzr merge lp:~vikoadi/audience/fix-nonvideo
Reviewer Review Type Date Requested Status
Audience Members Pending
Review via email: mp+231987@code.launchpad.net

Commit message

Don't try to get video size if doesn't have a video stream

Description of the change

dont try to get video size if doesnt have videostream

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 'src/Widgets/PreviewPopover.vala'
2--- src/Widgets/PreviewPopover.vala 2014-06-30 14:54:30 +0000
3+++ src/Widgets/PreviewPopover.vala 2014-08-23 10:37:11 +0000
4@@ -68,7 +68,7 @@
5 try {
6 var info = new Gst.PbUtils.Discoverer (10 * Gst.SECOND).discover_uri (uri);
7 var video = info.get_video_streams ();
8- if (video.data != null) {
9+ if (video != null && video.data != null) {
10 var video_info = (Gst.PbUtils.DiscovererVideoInfo)video.data;
11 uint video_width = video_info.get_width ();
12 uint video_height = video_info.get_height ();
13
14=== modified file 'src/Widgets/VideoPlayer.vala'
15--- src/Widgets/VideoPlayer.vala 2014-06-30 14:54:30 +0000
16+++ src/Widgets/VideoPlayer.vala 2014-08-23 10:37:11 +0000
17@@ -99,7 +99,7 @@
18 try {
19 var info = new Gst.PbUtils.Discoverer (10 * Gst.SECOND).discover_uri (value);
20 var video = info.get_video_streams ();
21- if (video.data != null) {
22+ if (video != null && video.data != null) {
23 var video_info = (Gst.PbUtils.DiscovererVideoInfo)video.data;
24 video_width = video_info.get_width ();
25 video_height = video_info.get_height ();

Subscribers

People subscribed via source and target branches