Merge lp:~rakete/eidete/no-duration-fix into lp:eidete

[Andreas Raster]

Someone in #gstreamer helped me figure it out. We need to manually send an EOS to the pipeline and wait for it to finish writing everything to disk before setting it to NULL. That fixes the duration problem, and it is even the correct way and not some ugly hack.

Still, please test before merging, changed when the main_window gets deleted.

[Tom Beckmann (tombeckmann)]

Thanks a lot, in my tests the main_window was never delted, so I added the call after the enddialog is shown, besides this everything works perfectly. Great work!
We may want to consider a little progress dialog, but it doesn't seem to be that urgent, I will report it as low priority bug.

review: Approve

=== modified file 'src/eidete.vala'
--- src/eidete.vala	2012-04-18 17:15:36 +0000
+++ src/eidete.vala	2012-04-22 01:22:18 +0000
@@ -391,10 +391,11 @@
 				return false;
 			});
 */
-			
+
 			this.main_window.destroy.connect ( () => {
-				if (pipeline != null)
-					pipeline.set_state (State.NULL);
+				if ( recording ) {
+					finish_recording ();
+				}
 			});
 			
 			Granite.Services.Logger.initialize ("Eidete");
@@ -408,11 +409,7 @@
 		        if (pause_rec)
     				this.main_window.present ();
 				else if (finish_rec) {
-				    this.recording = false;
-			        this.pipeline.set_state (State.NULL);
-                    var end = new Eidete.Widgets.EndDialog (this);
-                    end.show_all ();
-                    this.main_window.hide ();
+					finish_recording ();
 				}
 			}
 		}
@@ -457,9 +454,7 @@
 			});
 			
 			stop_bt.clicked.connect ( () => {
-				var end = new Eidete.Widgets.EndDialog (this);
-				end.show_all ();
-				this.main_window.destroy ();
+				finish_recording ();
 			});
 			
 			continue_bt.clicked.connect ( () => {
@@ -553,18 +548,32 @@
 			pipeline.set_state (State.PLAYING);
 			this.recording = true;
 		}
-		
+
+		public void finish_recording () {
+			if ( ! this.recording ) {
+				debug ("resuming recording\n");
+				this.pipeline.set_state(State.PLAYING);
+				this.recording = true;
+			}
+			pipeline.send_event (new Event.eos());
+		}
+
 		private bool bus_message_cb (Gst.Bus bus, Message msg){
 			switch (msg.type){
 				case Gst.MessageType.ERROR:
 					GLib.Error err; string debug;
 					msg.parse_error (out err, out debug);
-					print ("Error: %s\n", err.message);
+					stderr.printf ("Error: %s\n", err.message);
 					pipeline.set_state (State.NULL);
 					break;
 				case Gst.MessageType.EOS:
-					print ("Finished, why??\n");
+					debug ("received EOS\n");
 					pipeline.set_state (State.NULL);
+					this.recording = false;
+
+					var end = new Eidete.Widgets.EndDialog (this);
+					end.show_all ();
+
 					break;
 				default:
 					break;