mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

ges: Calm logging when not created TrackObject on purpose

Browse source
This commit is contained in:
Thibault Saunier 2012-02-02 15:29:30 -03:00
parent 979b9ac0b6
commit ad5bc85516
2 changed files with 26 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
ges/ges-timeline-standard-transition.c
View file

@ -191,29 +191,37 @@ ges_tl_transition_create_track_object (GESTimelineObject * obj,
{ {
GESTimelineStandardTransition *transition = GESTimelineStandardTransition *transition =
(GESTimelineStandardTransition *) obj; (GESTimelineStandardTransition *) obj;
GESTrackObject *res; GESTrackObject *res = NULL;
GESTrackType supportedformats; GESTrackType supportedformats;
GST_DEBUG ("Creating a GESTrackTransition"); GST_DEBUG ("Creating a GESTrackTransition");
supportedformats = ges_timeline_object_get_supported_formats (obj); supportedformats = ges_timeline_object_get_supported_formats (obj);
if (track->type == GES_TRACK_TYPE_VIDEO && if (track->type == GES_TRACK_TYPE_VIDEO) {
(supportedformats == GES_TRACK_TYPE_UNKNOWN || if (supportedformats == GES_TRACK_TYPE_UNKNOWN ||
supportedformats & GES_TRACK_TYPE_VIDEO)) { supportedformats & GES_TRACK_TYPE_VIDEO) {
res = GES_TRACK_OBJECT (ges_track_video_transition_new ()); GESTrackVideoTransition *trans;
ges_track_video_transition_set_transition_type ((GESTrackVideoTransition *)
res, transition->vtype);
} else if (track->type == GES_TRACK_TYPE_AUDIO && trans = ges_track_video_transition_new ();
(supportedformats == GES_TRACK_TYPE_UNKNOWN || ges_track_video_transition_set_transition_type (trans, transition->vtype);
supportedformats & GES_TRACK_TYPE_AUDIO)) {
res = GES_TRACK_OBJECT (trans);
} else {
GST_DEBUG ("Not creating transition as video track not on"
" supportedformats");
}
} else if (track->type == GES_TRACK_TYPE_AUDIO) {
if (supportedformats == GES_TRACK_TYPE_UNKNOWN ||
supportedformats & GES_TRACK_TYPE_AUDIO)
res = GES_TRACK_OBJECT (ges_track_audio_transition_new ()); res = GES_TRACK_OBJECT (ges_track_audio_transition_new ());
} else
GST_DEBUG ("Not creating transition as audio track"
" not on supportedformats");
else { } else
GST_WARNING ("Transitions don't handle this track type"); GST_WARNING ("Transitions don't handle this track type");
return NULL;
}
return res; return res;
} }

4
ges/ges-timeline.c
View file

@ -329,7 +329,9 @@ static void
add_object_to_track (GESTimelineObject * object, GESTrack * track) add_object_to_track (GESTimelineObject * object, GESTrack * track)
{ {
if (!ges_timeline_object_create_track_objects (object, track)) { if (!ges_timeline_object_create_track_objects (object, track)) {
GST_WARNING ("error creating track objects"); if ((track->type & ges_timeline_object_get_supported_formats (object))) {
GST_WARNING ("Error creating track objects");
}
} }
} }