[easytag] Remove unused argument from Ogg reading function



commit ac50c03cafefa2b1f3c8e579167a12e47762eadb
Author: David King <amigadave amigadave com>
Date:   Sat Nov 22 16:52:22 2014 +0000

    Remove unused argument from Ogg reading function

 src/tags/ogg_tag.c  |   15 ++++++---------
 src/tags/ogg_tag.h  |    2 +-
 src/tags/opus_tag.c |   15 ++-------------
 3 files changed, 9 insertions(+), 23 deletions(-)
---
diff --git a/src/tags/ogg_tag.c b/src/tags/ogg_tag.c
index 37dd746..29e7fbe 100644
--- a/src/tags/ogg_tag.c
+++ b/src/tags/ogg_tag.c
@@ -161,16 +161,14 @@ read_guint32_from_byte (guchar *str, gsize start)
 
 /*
  * et_add_file_tags_from_vorbis_comments:
- * @vc: the byte string
- * @FileTag: position to start with
- * @filename_utf8: display filename
+ * @vc: Vorbis comment from which to fill @FileTag
+ * @FileTag: tag to populate from @vc
  *
- * Reads vorbis comments and copies them to file tag.
+ * Reads Vorbis comments and copies them to file tag.
  */
-
 void
-et_add_file_tags_from_vorbis_comments (vorbis_comment *vc, File_Tag *FileTag,
-                                       const gchar *filename_utf8)
+et_add_file_tags_from_vorbis_comments (vorbis_comment *vc,
+                                       File_Tag *FileTag)
 {
     gchar *string = NULL;
     gchar *string1 = NULL;
@@ -715,8 +713,7 @@ ogg_tag_read_file_tag (GFile *file,
             g_print("%s -> Ogg vc:'%s'\n",g_path_get_basename(filename),vc->user_comments[i]);
     }*/
 
-    et_add_file_tags_from_vorbis_comments (vcedit_comments(state), FileTag,
-                                           filename_utf8);
+    et_add_file_tags_from_vorbis_comments (vcedit_comments(state), FileTag);
     vcedit_clear(state);
     g_free (filename_utf8);
 
diff --git a/src/tags/ogg_tag.h b/src/tags/ogg_tag.h
index 7c9e4dd..63ad616 100644
--- a/src/tags/ogg_tag.h
+++ b/src/tags/ogg_tag.h
@@ -34,7 +34,7 @@ G_BEGIN_DECLS
 gboolean ogg_tag_read_file_tag (GFile *file, File_Tag *FileTag, GError **error);
 gboolean ogg_tag_write_file_tag (const ET_File *ETFile, GError **error);
 
-void et_add_file_tags_from_vorbis_comments (vorbis_comment *vc, File_Tag *FileTag, const gchar 
*filename_utf8);
+void et_add_file_tags_from_vorbis_comments (vorbis_comment *vc, File_Tag *FileTag);
 void et_add_vorbis_comments_from_file_tags (vorbis_comment *vc, File_Tag *FileTag);
 
 G_END_DECLS
diff --git a/src/tags/opus_tag.c b/src/tags/opus_tag.c
index 42b514a..9cedd2c 100644
--- a/src/tags/opus_tag.c
+++ b/src/tags/opus_tag.c
@@ -58,7 +58,6 @@ et_opus_tag_read_file_tag (GFile *gfile, File_Tag *FileTag,
 {
     OggOpusFile *file;
     const OpusTags *tags;
-    GFileInfo *info;
 
     g_return_val_if_fail (gfile != NULL && FileTag != NULL, FALSE);
     g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
@@ -72,20 +71,10 @@ et_opus_tag_read_file_tag (GFile *gfile, File_Tag *FileTag,
     }
 
     tags = op_tags (file, 0);
-    info = g_file_query_info (gfile, G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME,
-                              G_FILE_QUERY_INFO_NONE, NULL, error);
-
-    if (!info)
-    {
-        op_free (file);
-        g_assert (error == NULL || *error != NULL);
-        return FALSE;
-    }
 
     /* The cast is safe according to the opusfile documentation. */
-    et_add_file_tags_from_vorbis_comments ((vorbis_comment *)tags, FileTag,
-                                           g_file_info_get_display_name (info));
-    g_object_unref (info);
+    et_add_file_tags_from_vorbis_comments ((vorbis_comment *)tags, FileTag);
+
     op_free (file);
 
     g_assert (error == NULL || *error == NULL);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]