mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-16 19:25:18 +00:00
Code Issues 1 Projects Releases Wiki Activity

ges: re-indent with GNU indent 2.2.12

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4182>
This commit is contained in:
Tim-Philipp Müller 2023-03-15 18:57:46 +00:00 committed by GStreamer Marge Bot
parent e857259e8d
commit f9eb4c5862
5 changed files with 30 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
subprojects/gst-editing-services/ges/ges-pipeline.c
View file

@ -242,7 +242,7 @@ _timeline_track_added_cb (GESTimeline * timeline, GESTrack * track,
GESPipeline * pipeline) GESPipeline * pipeline)
{ {
track_disable_last_gap (track, track_disable_last_gap (track,
! !(pipeline->priv->mode & (GES_PIPELINE_MODE_RENDER | !!(pipeline->priv->mode & (GES_PIPELINE_MODE_RENDER |
GES_PIPELINE_MODE_SMART_RENDER))); GES_PIPELINE_MODE_SMART_RENDER)));
_link_track (pipeline, track); _link_track (pipeline, track);
} }
@ -1208,7 +1208,7 @@ ges_pipeline_set_mode (GESPipeline * pipeline, GESPipelineFlags mode)
if (pipeline->priv->timeline) { if (pipeline->priv->timeline) {
gboolean disabled = gboolean disabled =
! !(mode & (GES_PIPELINE_MODE_RENDER | GES_PIPELINE_MODE_SMART_RENDER)); !!(mode & (GES_PIPELINE_MODE_RENDER | GES_PIPELINE_MODE_SMART_RENDER));
for (tmp = pipeline->priv->timeline->tracks; tmp; tmp = tmp->next) for (tmp = pipeline->priv->timeline->tracks; tmp; tmp = tmp->next)
track_disable_last_gap (GES_TRACK (tmp->data), disabled); track_disable_last_gap (GES_TRACK (tmp->data), disabled);

2
subprojects/gst-editing-services/ges/ges-source.c
View file

@ -121,7 +121,7 @@ _set_ghost_pad_target (GESSource * self, GstPad * srcpad, GstElement * element)
GstPadLinkReturn link_return; GstPadLinkReturn link_return;
GESSourcePrivate *priv = self->priv; GESSourcePrivate *priv = self->priv;
GESSourceClass *source_klass = GES_SOURCE_GET_CLASS (self); GESSourceClass *source_klass = GES_SOURCE_GET_CLASS (self);
gboolean use_converter = ! !priv->first_converter; gboolean use_converter = !!priv->first_converter;
if (source_klass->select_pad && !source_klass->select_pad (self, srcpad)) { if (source_klass->select_pad && !source_klass->select_pad (self, srcpad)) {
GST_INFO_OBJECT (self, "Ignoring pad %" GST_PTR_FORMAT, srcpad); GST_INFO_OBJECT (self, "Ignoring pad %" GST_PTR_FORMAT, srcpad);

2
subprojects/gst-editing-services/ges/ges-timeline.c
View file

@ -1656,7 +1656,7 @@ clip_track_element_added_cb (GESClip * clip,
if (auto_trans_track) { if (auto_trans_track) {
/* don't use track-selection */ /* don't use track-selection */
success = ! !ges_clip_add_child_to_track (clip, track_element, success = !!ges_clip_add_child_to_track (clip, track_element,
auto_trans_track, &error); auto_trans_track, &error);
gst_object_unref (auto_trans_track); gst_object_unref (auto_trans_track);
} else { } else {

24
subprojects/gst-editing-services/tests/check/ges/clip.c
View file

@ -2065,18 +2065,24 @@ GST_START_TEST (test_can_add_effect)
uri = ges_test_get_audio_video_uri (); uri = ges_test_get_audio_video_uri ();
clips[0] = (struct CanAddEffectData) { clips[0] = (struct CanAddEffectData) {
GES_CLIP (ges_test_clip_new ()), TRUE}; GES_CLIP (ges_test_clip_new ()), TRUE
};
clips[1] = (struct CanAddEffectData) { clips[1] = (struct CanAddEffectData) {
GES_CLIP (ges_uri_clip_new (uri)), TRUE}; GES_CLIP (ges_uri_clip_new (uri)), TRUE
};
clips[2] = (struct CanAddEffectData) { clips[2] = (struct CanAddEffectData) {
GES_CLIP (ges_title_clip_new ()), TRUE}; GES_CLIP (ges_title_clip_new ()), TRUE
};
clips[3] = (struct CanAddEffectData) { clips[3] = (struct CanAddEffectData) {
GES_CLIP (ges_effect_clip_new ("agingtv", "audioecho")), TRUE}; GES_CLIP (ges_effect_clip_new ("agingtv", "audioecho")), TRUE
};
clips[4] = (struct CanAddEffectData) { clips[4] = (struct CanAddEffectData) {
GES_CLIP (ges_transition_clip_new GES_CLIP (ges_transition_clip_new
(GES_VIDEO_STANDARD_TRANSITION_TYPE_CROSSFADE)), FALSE}; (GES_VIDEO_STANDARD_TRANSITION_TYPE_CROSSFADE)), FALSE
};
clips[5] = (struct CanAddEffectData) { clips[5] = (struct CanAddEffectData) {
GES_CLIP (ges_text_overlay_clip_new ()), FALSE}; GES_CLIP (ges_text_overlay_clip_new ()), FALSE
};
g_free (uri); g_free (uri);
@ -2435,8 +2441,8 @@ GST_START_TEST (test_children_max_duration)
GstClockTime max_duration; GstClockTime max_duration;
} clips[] = { } clips[] = {
{ {
NULL, GST_SECOND}, { NULL, GST_SECOND}, {
NULL, GST_CLOCK_TIME_NONE} NULL, GST_CLOCK_TIME_NONE}
}; };
ges_init (); ges_init ();

21
subprojects/gst-editing-services/tools/ges-launcher.c
View file

@ -278,16 +278,17 @@ print_keyboard_help (void)
const gchar *key_help; const gchar *key_help;
} key_controls[] = { } key_controls[] = {
{ {
"space", "pause/unpause"}, { "space", "pause/unpause"}, {
"q or ESC", "quit"}, { "q or ESC", "quit"}, {
"\342\206\222", "seek forward"}, { "\342\206\222", "seek forward"}, {
"\342\206\220", "seek backward"}, { "\342\206\220", "seek backward"}, {
"+", "increase playback rate"}, { "+", "increase playback rate"}, {
"-", "decrease playback rate"}, { "-", "decrease playback rate"}, {
"t", "enable/disable trick modes"}, { "t", "enable/disable trick modes"}, {
"s", "change subtitle track"}, { "s", "change subtitle track"}, {
"0", "seek to beginning"}, { "0", "seek to beginning"}, {
"k", "show keyboard shortcuts"},}; "k", "show keyboard shortcuts"},
};
guint i, chars_to_pad, desc_len, max_desc_len = 0; guint i, chars_to_pad, desc_len, max_desc_len = 0;
gst_print ("\n\n%s\n\n", "Interactive mode - keyboard controls:"); gst_print ("\n\n%s\n\n", "Interactive mode - keyboard controls:");