brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

recorder: keep recorder object alive until pipeline finishes

Browse Source 
We want to make sure the recorder isn't finalized until the
saved recording hits disk.  This means the pipeline object needs
a hard reference on the recorder.

https://bugzilla.gnome.org/show_bug.cgi?id=680647
This commit is contained in:
Ray Strode 2012-07-26 17:26:55 -04:00
parent f9819eb7b0
commit 9171bab5e5
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/shell-recorder.c
View File

@ -269,18 +269,6 @@ static void
shell_recorder_finalize (GObject *object) shell_recorder_finalize (GObject *object)
{ {
ShellRecorder *recorder = SHELL_RECORDER (object); ShellRecorder *recorder = SHELL_RECORDER (object);
GSList *l;
for (l = recorder->pipelines; l; l = l->next)
{
RecorderPipeline *pipeline = l->data;
/* Remove the back-reference. The pipeline will be freed
* when it finishes. (Or when the process exits, but that's
* out of our control.)
*/
pipeline->recorder = NULL;
}
if (recorder->update_memory_used_timeout) if (recorder->update_memory_used_timeout)
g_source_remove (recorder->update_memory_used_timeout); g_source_remove (recorder->update_memory_used_timeout);
@ -1344,6 +1332,8 @@ recorder_pipeline_free (RecorderPipeline *pipeline)
if (pipeline->outfile != -1) if (pipeline->outfile != -1)
close (pipeline->outfile); close (pipeline->outfile);
g_clear_object (&pipeline->recorder);
g_free (pipeline); g_free (pipeline);
} }
@ -1452,7 +1442,7 @@ recorder_open_pipeline (ShellRecorder *recorder)
GstBus *bus; GstBus *bus;
pipeline = g_new0(RecorderPipeline, 1); pipeline = g_new0(RecorderPipeline, 1);
pipeline->recorder = recorder; pipeline->recorder = g_object_ref (recorder);
pipeline->outfile = - 1; pipeline->outfile = - 1;
pipeline_description = recorder->pipeline_description; pipeline_description = recorder->pipeline_description;