[gthumb/ext: 5/18] removed unused variables
- From: Paolo Bacchilega <paobac src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gthumb/ext: 5/18] removed unused variables
- Date: Fri, 6 Nov 2009 00:16:00 +0000 (UTC)
commit 8580d66751332bdda4affaef862b6ccefcd24b1e
Author: Paolo Bacchilega <paobac src gnome org>
Date: Sun Nov 1 22:53:56 2009 +0100
removed unused variables
extensions/gstreamer/gstreamer-utils.c | 77 ++++++--------------------------
1 files changed, 14 insertions(+), 63 deletions(-)
---
diff --git a/extensions/gstreamer/gstreamer-utils.c b/extensions/gstreamer/gstreamer-utils.c
index 540b764..ea43d0f 100644
--- a/extensions/gstreamer/gstreamer-utils.c
+++ b/extensions/gstreamer/gstreamer-utils.c
@@ -51,26 +51,20 @@ static gboolean gstreamer_initialized = FALSE;
typedef struct {
- GstElement *playbin;
-
- GstTagList *tagcache;
- GstTagList *audiotags;
- GstTagList *videotags;
- GstTagList *demuxertags;
-
- gboolean has_audio;
- gboolean has_video;
-
- gint video_height;
- gint video_width;
- gint video_fps_n;
- gint video_fps_d;
- gint video_bitrate;
- char *video_codec;
- gint audio_channels;
- gint audio_samplerate;
- gint audio_bitrate;
- char *audio_codec;
+ GstElement *playbin;
+ GstTagList *tagcache;
+ gboolean has_audio;
+ gboolean has_video;
+ gint video_height;
+ gint video_width;
+ gint video_fps_n;
+ gint video_fps_d;
+ gint video_bitrate;
+ char *video_codec;
+ gint audio_channels;
+ gint audio_samplerate;
+ gint audio_bitrate;
+ char *audio_codec;
} MetadataExtractor;
@@ -82,21 +76,6 @@ reset_extractor_data (MetadataExtractor *extractor)
extractor->tagcache = NULL;
}
- if (extractor->audiotags != NULL) {
- gst_tag_list_free (extractor->audiotags);
- extractor->audiotags = NULL;
- }
-
- if (extractor->videotags != NULL) {
- gst_tag_list_free (extractor->videotags);
- extractor->videotags = NULL;
- }
-
- if (extractor->demuxertags != NULL) {
- gst_tag_list_free (extractor->demuxertags);
- extractor->demuxertags = NULL;
- }
-
g_free (extractor->audio_codec);
extractor->audio_codec = NULL;
@@ -590,39 +569,11 @@ message_loop_to_state_change (MetadataExtractor *extractor,
tag_list = NULL;
gst_message_parse_tag (message, &tag_list);
-
- /* all tags */
-
result = gst_tag_list_merge (extractor->tagcache, tag_list, GST_TAG_MERGE_KEEP);
if (extractor->tagcache != NULL)
gst_tag_list_free (extractor->tagcache);
extractor->tagcache = result;
- /* media-type-specific tags */
-
- if (GST_IS_ELEMENT (message->src) && (f = gst_element_get_factory (GST_ELEMENT (message->src)))) {
- const char *klass;
- GstTagList **cache;
-
- klass = gst_element_factory_get_klass (f);
-
- cache = NULL;
- if (g_strrstr (klass, "Audio"))
- cache = &extractor->audiotags;
- else if (g_strrstr (klass, "Video"))
- cache = &extractor->videotags;
- else if (g_strrstr (klass, "Demuxer"))
- cache = &extractor->demuxertags;
-
- if (cache != NULL) {
- result = gst_tag_list_merge (*cache, tag_list, GST_TAG_MERGE_KEEP);
- if (*cache != NULL)
- gst_tag_list_free (*cache);
- *cache = result;
- }
- }
-
- /* clean up */
gst_tag_list_free (tag_list);
break;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]