1 --- libogmrip/ogmrip-encoding.c.orig 2013-10-05 15:05:24.000000000 +0200
2 +++ libogmrip/ogmrip-encoding.c 2014-06-07 08:00:31.601300584 +0200
4 encoding->priv->task.options,
6 encoding->priv->task.type,
7 - (OGMRipTaskDetail) 0);
8 + (OGMRipTaskDetail) 0.0);
13 encoding->priv->task.options,
15 encoding->priv->task.type,
16 - (OGMRipTaskDetail) 0);
17 + (OGMRipTaskDetail) 0.0);
21 @@ -1706,10 +1706,10 @@
22 return OGMJOB_RESULT_ERROR;
24 ogmrip_encoding_emit_task (encoding, spawn,
25 - NULL, OGMRIP_TASK_RUN, OGMRIP_TASK_ANALYZE, (OGMRipTaskDetail) 0);
26 + NULL, OGMRIP_TASK_RUN, OGMRIP_TASK_ANALYZE, (OGMRipTaskDetail) 0.0);
27 result = ogmrip_video_codec_analyze (OGMRIP_VIDEO_CODEC (spawn), 0) ? OGMJOB_RESULT_SUCCESS : OGMJOB_RESULT_CANCEL;
28 ogmrip_encoding_emit_task (encoding, spawn,
29 - NULL, OGMRIP_TASK_COMPLETE, OGMRIP_TASK_ANALYZE, (OGMRipTaskDetail) result);
30 + NULL, OGMRIP_TASK_COMPLETE, OGMRIP_TASK_ANALYZE, (OGMRipTaskDetail) (gdouble) result);
32 if (result == OGMJOB_RESULT_SUCCESS)
36 return OGMJOB_RESULT_ERROR;
38 - ogmrip_encoding_emit_task (encoding, spawn, NULL, OGMRIP_TASK_RUN, OGMRIP_TASK_CHAPTERS, (OGMRipTaskDetail) 0);
39 + ogmrip_encoding_emit_task (encoding, spawn, NULL, OGMRIP_TASK_RUN, OGMRIP_TASK_CHAPTERS, (OGMRipTaskDetail) 0.0);
40 result = ogmjob_spawn_run (spawn, error);
41 - ogmrip_encoding_emit_task (encoding, spawn, NULL, OGMRIP_TASK_COMPLETE, OGMRIP_TASK_CHAPTERS, (OGMRipTaskDetail) result);
42 + ogmrip_encoding_emit_task (encoding, spawn, NULL, OGMRIP_TASK_COMPLETE, OGMRIP_TASK_CHAPTERS, (OGMRipTaskDetail) (gdouble) result);
44 if (result != OGMJOB_RESULT_SUCCESS)
46 @@ -1871,10 +1871,10 @@
47 ogmrip_codec_set_options (OGMRIP_CODEC (spawn), encoding->priv->profile_section);
49 ogmrip_encoding_emit_task (encoding, spawn, (OGMRipOptions *) &data->options,
50 - OGMRIP_TASK_RUN, OGMRIP_TASK_SUBP, (OGMRipTaskDetail) 0);
51 + OGMRIP_TASK_RUN, OGMRIP_TASK_SUBP, (OGMRipTaskDetail) 0.0);
52 result = ogmjob_spawn_run (spawn, error);
53 ogmrip_encoding_emit_task (encoding, spawn, (OGMRipOptions *) &data->options,
54 - OGMRIP_TASK_COMPLETE, OGMRIP_TASK_SUBP, (OGMRipTaskDetail) result);
55 + OGMRIP_TASK_COMPLETE, OGMRIP_TASK_SUBP, (OGMRipTaskDetail) (gdouble) result);
57 if (result != OGMJOB_RESULT_SUCCESS)
59 @@ -1987,10 +1987,10 @@
60 ogmrip_codec_set_options (OGMRIP_CODEC (spawn), encoding->priv->profile_section);
62 ogmrip_encoding_emit_task (encoding, spawn, (OGMRipOptions *) &data->options,
63 - OGMRIP_TASK_RUN, OGMRIP_TASK_AUDIO, (OGMRipTaskDetail) 0);
64 + OGMRIP_TASK_RUN, OGMRIP_TASK_AUDIO, (OGMRipTaskDetail) 0.0);
65 result = ogmjob_spawn_run (spawn, error);
66 ogmrip_encoding_emit_task (encoding, spawn, (OGMRipOptions *) &data->options,
67 - OGMRIP_TASK_COMPLETE, OGMRIP_TASK_AUDIO, (OGMRipTaskDetail) result);
68 + OGMRIP_TASK_COMPLETE, OGMRIP_TASK_AUDIO, (OGMRipTaskDetail) (gdouble) result);
70 if (result != OGMJOB_RESULT_SUCCESS)
72 @@ -2058,10 +2058,10 @@
74 case OGMRIP_OPTIONS_AUTOMATIC:
75 ogmrip_encoding_emit_task (encoding, OGMJOB_SPAWN (codec),
76 - NULL, OGMRIP_TASK_RUN, OGMRIP_TASK_CROP, (OGMRipTaskDetail) 0);
77 + NULL, OGMRIP_TASK_RUN, OGMRIP_TASK_CROP, (OGMRipTaskDetail) 0.0);
78 result = ogmrip_video_codec_autocrop (codec, 0) ? OGMJOB_RESULT_SUCCESS : OGMJOB_RESULT_CANCEL;
79 ogmrip_encoding_emit_task (encoding, OGMJOB_SPAWN (codec),
80 - NULL, OGMRIP_TASK_COMPLETE, OGMRIP_TASK_CROP, (OGMRipTaskDetail) result);
81 + NULL, OGMRIP_TASK_COMPLETE, OGMRIP_TASK_CROP, (OGMRipTaskDetail) (gdouble) result);
83 if (result != OGMJOB_RESULT_SUCCESS)
84 return OGMJOB_RESULT_CANCEL;
86 if (encoding->priv->profile_section && encoding->priv->preset == OGMRIP_VIDEO_PRESET_USER)
87 ogmrip_codec_set_options (OGMRIP_CODEC (codec), encoding->priv->profile_section);
89 - ogmrip_encoding_emit_task (encoding, OGMJOB_SPAWN (codec), NULL, OGMRIP_TASK_RUN, OGMRIP_TASK_VIDEO, (OGMRipTaskDetail) 0);
90 + ogmrip_encoding_emit_task (encoding, OGMJOB_SPAWN (codec), NULL, OGMRIP_TASK_RUN, OGMRIP_TASK_VIDEO, (OGMRipTaskDetail) 0.0);
91 result = ogmjob_spawn_run (OGMJOB_SPAWN (codec), error);
92 - ogmrip_encoding_emit_task (encoding, OGMJOB_SPAWN (codec), NULL, OGMRIP_TASK_COMPLETE, OGMRIP_TASK_VIDEO, (OGMRipTaskDetail) result);
93 + ogmrip_encoding_emit_task (encoding, OGMJOB_SPAWN (codec), NULL, OGMRIP_TASK_COMPLETE, OGMRIP_TASK_VIDEO, (OGMRipTaskDetail) (gdouble) result);
95 if (result == OGMJOB_RESULT_ERROR && error && !(*error))
96 g_set_error (error, OGMRIP_ENCODING_ERROR, OGMRIP_ENCODING_ERROR_UNKNOWN,
98 ogmjob_log_printf ("\nMerging\n");
99 ogmjob_log_printf ("-------\n\n");
101 - ogmrip_encoding_emit_task (encoding, OGMJOB_SPAWN (container), NULL, OGMRIP_TASK_RUN, OGMRIP_TASK_MERGE, (OGMRipTaskDetail) 0);
102 + ogmrip_encoding_emit_task (encoding, OGMJOB_SPAWN (container), NULL, OGMRIP_TASK_RUN, OGMRIP_TASK_MERGE, (OGMRipTaskDetail) 0.0);
103 result = ogmjob_spawn_run (OGMJOB_SPAWN (container), error);
104 - ogmrip_encoding_emit_task (encoding, OGMJOB_SPAWN (container), NULL, OGMRIP_TASK_COMPLETE, OGMRIP_TASK_MERGE, (OGMRipTaskDetail) result);
105 + ogmrip_encoding_emit_task (encoding, OGMJOB_SPAWN (container), NULL, OGMRIP_TASK_COMPLETE, OGMRIP_TASK_MERGE, (OGMRipTaskDetail) (gdouble) result);
109 @@ -2376,7 +2376,7 @@
110 relative = ogmrip_encoding_get_relative (encoding);
111 ogmrip_encoding_set_relative_internal (encoding, TRUE);
113 - ogmrip_encoding_emit_task (encoding, NULL, NULL, OGMRIP_TASK_RUN, OGMRIP_TASK_TEST, (OGMRipTaskDetail) 0);
114 + ogmrip_encoding_emit_task (encoding, NULL, NULL, OGMRIP_TASK_RUN, OGMRIP_TASK_TEST, (OGMRipTaskDetail) 0.0);
116 ogmrip_encoding_set_play_length (encoding, SAMPLE_LENGTH * SAMPLE_PERCENT);
118 @@ -2430,7 +2430,7 @@
122 - ogmrip_encoding_emit_task (encoding, NULL, NULL, OGMRIP_TASK_COMPLETE, OGMRIP_TASK_TEST, (OGMRipTaskDetail) 0);
123 + ogmrip_encoding_emit_task (encoding, NULL, NULL, OGMRIP_TASK_COMPLETE, OGMRIP_TASK_TEST, (OGMRipTaskDetail) 0.0);
125 if (result == OGMJOB_RESULT_SUCCESS && files > 0)
127 @@ -5972,9 +5972,9 @@
129 OGMRIP_ENCODING_SET_FLAGS (encoding, OGMRIP_ENCODING_BACKUPING);
131 - ogmrip_encoding_emit_task (encoding, spawn, NULL, OGMRIP_TASK_RUN, OGMRIP_TASK_BACKUP, (OGMRipTaskDetail) 0);
132 + ogmrip_encoding_emit_task (encoding, spawn, NULL, OGMRIP_TASK_RUN, OGMRIP_TASK_BACKUP, (OGMRipTaskDetail) 0.0);
133 result = ogmjob_spawn_run (spawn, error);
134 - ogmrip_encoding_emit_task (encoding, spawn, NULL, OGMRIP_TASK_COMPLETE, OGMRIP_TASK_BACKUP, (OGMRipTaskDetail) 0);
135 + ogmrip_encoding_emit_task (encoding, spawn, NULL, OGMRIP_TASK_COMPLETE, OGMRIP_TASK_BACKUP, (OGMRipTaskDetail) 0.0);
137 OGMRIP_ENCODING_UNSET_FLAGS (encoding, OGMRIP_ENCODING_BACKUPING);