Merge lp:~shockone89/audience/fix-1163695 into lp:~audience-members/audience/trunk

[Volodymyr Shatsky]

MediaSlider now keeps the aspect ratio; Title isn't cut on the first dot and displays apostrophes correctly

[David Gomes (davidgomes)]

replace ("%7D", "}").replace ("_", " ").replace ("."," ").
↓
replace ("%7D", "}").replace ("_", " ").replace (".", " ").

replace (" "," ").replace ("%60", "\'");
↓
replace (" ", " ").replace ("%60", "\'");

controls.slider.preview.width = (float)video_width / video_height * controls.slider.preview.height;
↓
controls.slider.preview.width = (float) video_width / video_height * controls.slider.preview.height;

[lp:~shockone89/audience/fix-1163695]

252. By Volodymyr Shatsky on 2013-04-05

Fixed formatting. Add audio and subtitles shortcuts

253. By Volodymyr Shatsky on 2013-04-05

Move debug information calls

[Volodymyr Shatsky (shockone89)]

Done.

[Tom Beckmann (tombeckmann)]

Looks pretty awesome to me, good job!

For the aspect ratio in the preview, for 16:9 we now get a small overflow on the sides, but I suppose that doesn't really matter all that much.

Audio switching looks fine to me, you'd just have to update the currently set track in the UI too.

Text switching is a bit more problematical. Updating the UI is obviously required here as well, but the cycling should include turning off. You could fallback to the videoplayer's current-text property instead of the playbin's which is supposed to handle this by turning subtitles off when set to -1 (but that's still quite buggy for unknown reasons), so once we got it working there, the cycling will work fine too.

Looking at the get_basename function now, I wonder why I wrote it that complicated. If you want to invest some more time in it, you may want to consider using string.last_index_of instead of the loop. Otherwise it works fine with your fix and we'd revisit that later.

And on a last, small note, you got a typo at the preview width line ("priview").

Once you fixed those issues we can merge the branch, and that's why one usually creates a separate branch for each fix, so we can merge them sooner ;)

[Tom Beckmann (tombeckmann)]

review: Needs Fixing

[Cody Garver (codygarver)]

It would be better if you submitted one branch per bug fix.

[lp:~shockone89/audience/fix-1163695]

254. By Volodymyr Shatsky on 2013-04-06

Switching audio or subtitles from keyboard now changes the combobox in UI

[Volodymyr Shatsky (shockone89)]

Sorry about branches, I'm not very comfortable with bzr. Will do.

What is the cause of the overflow. Could we fix it casting the number to int?

In order to sync audio and subtitles switching, I had to make these fields in TagView public:
public Gtk.ComboBoxText languages;
public Gtk.ComboBoxText subtitles;
Yeah, dealing with disabled subtitles was a bit complicated, currently I'm getting the value directly from the combobox — the only way it works properly.

I tried to rewrite the utility methods with last_index_of_char, but it produced a lot of errors, so I changed it back.
https://dl.dropbox.com/u/608214/scrn/1365231619.png . I think it would be easy to fix adding some NULL checks, but it would became clumsy and not so much better than the old variant. Besides, for loop works faster ☺.

Do you receive a notification, when I push into this repo, or should I write a comment?

[lp:~shockone89/audience/fix-1163695]

255. By Volodymyr Shatsky on 2013-04-06

Small formatting fix

[Tom Beckmann (tombeckmann)]

Looks good to me now from the code. I'll test it tomorrow, and I'll see if we can get this branch in first lp:~tombeckmann/audience/external-subtitles which possibly fixes subtitle switching, we're still testing on it.

[Tom Beckmann (tombeckmann)]

Oh and for the notifications, we only receive emails when you comment on the merge request. For commits there'll be no message.

[Tom Beckmann (tombeckmann)]

I had two fixes two small conflicts, but now it looks like it's working perfectly. Well done!

review: Approve

=== modified file 'Audience/Audience.vala'
--- Audience/Audience.vala	2013-04-02 16:46:22 +0000
+++ Audience/Audience.vala	2013-04-06 11:47:23 +0000
@@ -248,6 +248,12 @@
                     case Gdk.Key.Right:
                         video_player.progress += 0.05;
                         break;
+                    case Gdk.Key.a:
+                        next_audio ();
+                        break;
+                    case Gdk.Key.s:
+                        next_text ();
+                        break;
                     default:
                         break;
                 }
@@ -500,6 +506,36 @@
                 }
             });
         }
+
+        public void next_audio () {
+            int n_audio;
+            video_player.playbin.get ("n-audio", out n_audio);
+            int current = video_player.current_audio;
+
+            if (n_audio > 1) {
+                if (current < n_audio - 1) {
+                    current += 1;
+                } else {
+                    current = 0;
+                }
+            }
+            tagview.languages.active_id = current.to_string ();               
+        }
+
+        public void next_text () {
+            int n_text;
+            video_player.playbin.get ("n-text", out n_text);
+            int current = int.parse (tagview.subtitles.active_id);
+
+            if (n_text > 1) {
+                if (current < n_text - 1) {
+                    current  += 1;
+                } else {
+                    current = -1;
+                }
+            }           
+            tagview.subtitles.active_id = current.to_string ();
+        }
         
         private inline void save_last_played_videos () {
             string res = "";

=== modified file 'Audience/Utils.vala'
--- Audience/Utils.vala	2013-04-01 01:21:39 +0000
+++ Audience/Utils.vala	2013-04-06 11:47:23 +0000
@@ -29,7 +29,8 @@
         title = title.replace ("%20", " ").
             replace ("%3B", ";").
             replace ("%5B", "[").replace ("%5D", "]").replace ("%7B", "{").
-            replace ("%7D", "}").replace ("_", " ").replace ("."," ").replace ("  "," ");
+            replace ("%7D", "}").replace ("_", " ").replace (".", " ").
+            replace ("  ", " ").replace ("%60", "\'");
         return title;
     }
 
@@ -37,18 +38,19 @@
         int i=0;
         for (i=filename.length;i!=0;i--) {
             if (filename [i] == '.')
-                break;
+                break;       
         }
         return filename.substring (i+1);
     }
+
     public static string get_basename (string filename) {
         int start = 0, end = 0;
         for (start=filename.length; start != 0; start--) {
             if (filename[start] == '/') {
-            	start ++;
-            	break;
-        	}
-            if (filename[start] == '.')
+                start ++;
+                break;
+            }
+            if (filename[start] == '.' && end == 0)
                 end = start;
         }
         return filename.substring (start, end - start);

=== modified file 'Audience/Widgets/MediaSlider.vala'
--- Audience/Widgets/MediaSlider.vala	2013-04-02 16:46:22 +0000
+++ Audience/Widgets/MediaSlider.vala	2013-04-06 11:47:23 +0000
@@ -43,7 +43,7 @@
             preview.scale_y = 0.0;
             preview.scale_gravity = Clutter.Gravity.CENTER;
             preview.height =  90.0f;
-            preview.width =  120.0f;
+            // preview.width is set in VideoPlayer.vala
 
 			// connect gstreamer stuff
 #if HAS_CLUTTER_GST_1

=== modified file 'Audience/Widgets/TagView.vala'
--- Audience/Widgets/TagView.vala	2013-04-01 04:45:31 +0000
+++ Audience/Widgets/TagView.vala	2013-04-06 11:47:23 +0000
@@ -24,8 +24,8 @@
         public Gtk.Grid taggrid;
         public Audience.App app;
         
-        private Gtk.ComboBoxText languages;
-        private Gtk.ComboBoxText subtitles;
+        public Gtk.ComboBoxText languages;
+        public Gtk.ComboBoxText subtitles;
         
         private Granite.Drawing.BufferSurface buffer;
         int shadow_blur = 30;

=== modified file 'Audience/Widgets/VideoPlayer.vala'
--- Audience/Widgets/VideoPlayer.vala	2013-04-02 16:46:22 +0000
+++ Audience/Widgets/VideoPlayer.vala	2013-04-06 11:47:23 +0000
@@ -444,6 +444,7 @@
 			controls.content.invalidate ();
 
 			panel.x = get_stage ().width - panel.width - 10;
+			controls.slider.preview.width = (float) video_width / video_height * controls.slider.preview.height;
 
 			return true;
 		}