gnome-commander r2522 - trunk/src/tags



Author: epiotr
Date: Tue Apr  7 17:35:28 2009
New Revision: 2522
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=2522&view=rev

Log:
noop: rename finfo -> f

Modified:
   trunk/src/tags/gnome-cmd-tags-doc.cc
   trunk/src/tags/gnome-cmd-tags-doc.h
   trunk/src/tags/gnome-cmd-tags-exiv2.cc
   trunk/src/tags/gnome-cmd-tags-exiv2.h
   trunk/src/tags/gnome-cmd-tags-file.cc
   trunk/src/tags/gnome-cmd-tags-file.h
   trunk/src/tags/gnome-cmd-tags-poppler.cc
   trunk/src/tags/gnome-cmd-tags-poppler.h
   trunk/src/tags/gnome-cmd-tags-taglib.h
   trunk/src/tags/gnome-cmd-tags.cc
   trunk/src/tags/gnome-cmd-tags.h

Modified: trunk/src/tags/gnome-cmd-tags-doc.cc
==============================================================================
--- trunk/src/tags/gnome-cmd-tags-doc.cc	(original)
+++ trunk/src/tags/gnome-cmd-tags-doc.cc	Tue Apr  7 17:35:28 2009
@@ -452,25 +452,25 @@
 }
 
 
-void gcmd_tags_libgsf_load_metadata(GnomeCmdFile *finfo)
+void gcmd_tags_libgsf_load_metadata(GnomeCmdFile *f)
 {
-    g_return_if_fail (finfo != NULL);
-    g_return_if_fail (finfo->info != NULL);
+    g_return_if_fail (f != NULL);
+    g_return_if_fail (f->info != NULL);
 
 #ifdef HAVE_GSF
-    if (finfo->metadata && finfo->metadata->is_accessed(TAG_DOC))  return;
+    if (f->metadata && f->metadata->is_accessed(TAG_DOC))  return;
 
-    if (!finfo->metadata)
-        finfo->metadata = new GnomeCmdFileMetadata;
+    if (!f->metadata)
+        f->metadata = new GnomeCmdFileMetadata;
 
-    if (!finfo->metadata)  return;
+    if (!f->metadata)  return;
 
-    finfo->metadata->mark_as_accessed(TAG_DOC);
+    f->metadata->mark_as_accessed(TAG_DOC);
 
-    if (!gnome_cmd_file_is_local(finfo))  return;
+    if (!gnome_cmd_file_is_local(f))  return;
 
     GError *err = NULL;
-    gchar *fname = gnome_cmd_file_get_real_path (finfo);
+    gchar *fname = gnome_cmd_file_get_real_path (f);
 
     DEBUG('t', "Loading doc metadata for '%s'\n", fname);
 
@@ -492,10 +492,10 @@
     GsfInfile *infile = NULL;
 
     if ((infile = gsf_infile_msole_new (input, NULL)))
-        process_msole_infile(infile, finfo->metadata);
+        process_msole_infile(infile, f->metadata);
     else
         if ((infile = gsf_infile_zip_new (input, NULL)))
-            process_opendoc_infile(infile, finfo->metadata);
+            process_opendoc_infile(infile, f->metadata);
 
     if (infile)
         g_object_unref (G_OBJECT (infile));

Modified: trunk/src/tags/gnome-cmd-tags-doc.h
==============================================================================
--- trunk/src/tags/gnome-cmd-tags-doc.h	(original)
+++ trunk/src/tags/gnome-cmd-tags-doc.h	Tue Apr  7 17:35:28 2009
@@ -27,6 +27,6 @@
 void gcmd_tags_libgsf_init();
 void gcmd_tags_libgsf_shutdown();
 
-void gcmd_tags_libgsf_load_metadata(GnomeCmdFile *finfo);
+void gcmd_tags_libgsf_load_metadata(GnomeCmdFile *f);
 
 #endif // __GNOME_CMD_TAGS_DOC_H__

Modified: trunk/src/tags/gnome-cmd-tags-exiv2.cc
==============================================================================
--- trunk/src/tags/gnome-cmd-tags-exiv2.cc	(original)
+++ trunk/src/tags/gnome-cmd-tags-exiv2.cc	Tue Apr  7 17:35:28 2009
@@ -364,27 +364,27 @@
 }
 
 
-void gcmd_tags_exiv2_load_metadata(GnomeCmdFile *finfo)
+void gcmd_tags_exiv2_load_metadata(GnomeCmdFile *f)
 {
-    g_return_if_fail (finfo != NULL);
-    g_return_if_fail (finfo->info != NULL);
+    g_return_if_fail (f != NULL);
+    g_return_if_fail (f->info != NULL);
 
-    if (finfo->metadata && finfo->metadata->is_accessed(TAG_IMAGE))  return;
+    if (f->metadata && f->metadata->is_accessed(TAG_IMAGE))  return;
 
-    if (!finfo->metadata)
-        finfo->metadata = new GnomeCmdFileMetadata;
+    if (!f->metadata)
+        f->metadata = new GnomeCmdFileMetadata;
 
-    if (!finfo->metadata)  return;
+    if (!f->metadata)  return;
 
-    finfo->metadata->mark_as_accessed(TAG_IMAGE);
+    f->metadata->mark_as_accessed(TAG_IMAGE);
 #ifdef HAVE_EXIV2
-    finfo->metadata->mark_as_accessed(TAG_EXIF);
-    finfo->metadata->mark_as_accessed(TAG_IPTC);
+    f->metadata->mark_as_accessed(TAG_EXIF);
+    f->metadata->mark_as_accessed(TAG_IPTC);
 #endif
 
-    if (!gnome_cmd_file_is_local(finfo))  return;
+    if (!gnome_cmd_file_is_local(f))  return;
 
-    gchar *fname = gnome_cmd_file_get_real_path (finfo);
+    gchar *fname = gnome_cmd_file_get_real_path (f);
 
     DEBUG('t', "Loading image metadata for '%s'\n", fname);
 
@@ -395,8 +395,8 @@
 
         image->readMetadata();
 
-        readTags(finfo->metadata, image->exifData());
-        readTags(finfo->metadata, image->iptcData());
+        readTags(f->metadata, image->exifData());
+        readTags(f->metadata, image->iptcData());
     }
 
     catch (AnyError &e)
@@ -412,6 +412,6 @@
     if (!fmt)
         return;
 
-    finfo->metadata->addf (TAG_IMAGE_WIDTH, "%i", width);
-    finfo->metadata->addf (TAG_IMAGE_HEIGHT, "%i", height);
+    f->metadata->addf (TAG_IMAGE_WIDTH, "%i", width);
+    f->metadata->addf (TAG_IMAGE_HEIGHT, "%i", height);
 }

Modified: trunk/src/tags/gnome-cmd-tags-exiv2.h
==============================================================================
--- trunk/src/tags/gnome-cmd-tags-exiv2.h	(original)
+++ trunk/src/tags/gnome-cmd-tags-exiv2.h	Tue Apr  7 17:35:28 2009
@@ -27,6 +27,6 @@
 void gcmd_tags_exiv2_init();
 inline void gcmd_tags_exiv2_shutdown()      {}
 
-void gcmd_tags_exiv2_load_metadata(GnomeCmdFile *finfo);
+void gcmd_tags_exiv2_load_metadata(GnomeCmdFile *f);
 
 #endif // __GNOME_CMD_TAGS_EXIV2_H__

Modified: trunk/src/tags/gnome-cmd-tags-file.cc
==============================================================================
--- trunk/src/tags/gnome-cmd-tags-file.cc	(original)
+++ trunk/src/tags/gnome-cmd-tags-file.cc	Tue Apr  7 17:35:28 2009
@@ -28,43 +28,43 @@
 using namespace std;
 
 
-void gcmd_tags_file_load_metadata(GnomeCmdFile *finfo)
+void gcmd_tags_file_load_metadata(GnomeCmdFile *f)
 {
-    g_return_if_fail (finfo != NULL);
-    g_return_if_fail (finfo->info != NULL);
+    g_return_if_fail (f != NULL);
+    g_return_if_fail (f->info != NULL);
 
-    if (finfo->metadata && finfo->metadata->is_accessed(TAG_FILE))  return;
+    if (f->metadata && f->metadata->is_accessed(TAG_FILE))  return;
 
-    if (!finfo->metadata)
-        finfo->metadata = new GnomeCmdFileMetadata;
+    if (!f->metadata)
+        f->metadata = new GnomeCmdFileMetadata;
 
-    if (!finfo->metadata)  return;
+    if (!f->metadata)  return;
 
-    finfo->metadata->mark_as_accessed(TAG_FILE);
+    f->metadata->mark_as_accessed(TAG_FILE);
 
-    // if (!gnome_cmd_file_is_local(finfo))  return;
+    // if (!gnome_cmd_file_is_local(f))  return;
 
-    gchar *dpath = gnome_cmd_file_get_dirname(finfo);
+    gchar *dpath = gnome_cmd_file_get_dirname(f);
 
     static char buff[32];
 
-    finfo->metadata->add(TAG_FILE_NAME, finfo->info->name);
-    finfo->metadata->add(TAG_FILE_PATH, dpath);
+    f->metadata->add(TAG_FILE_NAME, f->info->name);
+    f->metadata->add(TAG_FILE_PATH, dpath);
 
     g_free (dpath);
 
-    gchar *uri_str = gnome_cmd_file_get_uri_str (finfo, GNOME_VFS_URI_HIDE_PASSWORD);
-    finfo->metadata->add(TAG_FILE_LINK, uri_str);
+    gchar *uri_str = gnome_cmd_file_get_uri_str (f, GNOME_VFS_URI_HIDE_PASSWORD);
+    f->metadata->add(TAG_FILE_LINK, uri_str);
     g_free (uri_str);
 
-    finfo->metadata->add(TAG_FILE_SIZE, finfo->info->size);
+    f->metadata->add(TAG_FILE_SIZE, f->info->size);
 
-    strftime(buff,sizeof(buff),"%Y-%m-%d %T",localtime(&finfo->info->atime));
-    finfo->metadata->add(TAG_FILE_ACCESSED, buff);
-    strftime(buff,sizeof(buff),"%Y-%m-%d %T",localtime(&finfo->info->mtime));
-    finfo->metadata->add(TAG_FILE_MODIFIED, buff);
+    strftime(buff,sizeof(buff),"%Y-%m-%d %T",localtime(&f->info->atime));
+    f->metadata->add(TAG_FILE_ACCESSED, buff);
+    strftime(buff,sizeof(buff),"%Y-%m-%d %T",localtime(&f->info->mtime));
+    f->metadata->add(TAG_FILE_MODIFIED, buff);
 
-    finfo->metadata->add(TAG_FILE_PERMISSIONS, perm2textstring(finfo->info->permissions,buff,sizeof(buff)));
+    f->metadata->add(TAG_FILE_PERMISSIONS, perm2textstring(f->info->permissions,buff,sizeof(buff)));
 
-    finfo->metadata->add(TAG_FILE_FORMAT, finfo->info->type==GNOME_VFS_FILE_TYPE_DIRECTORY ? "Folder" : finfo->info->mime_type);
+    f->metadata->add(TAG_FILE_FORMAT, f->info->type==GNOME_VFS_FILE_TYPE_DIRECTORY ? "Folder" : f->info->mime_type);
 }

Modified: trunk/src/tags/gnome-cmd-tags-file.h
==============================================================================
--- trunk/src/tags/gnome-cmd-tags-file.h	(original)
+++ trunk/src/tags/gnome-cmd-tags-file.h	Tue Apr  7 17:35:28 2009
@@ -27,6 +27,6 @@
 inline void gcmd_tags_file_init()           {}
 inline void gcmd_tags_file_shutdown()       {}
 
-void gcmd_tags_file_load_metadata(GnomeCmdFile *finfo);
+void gcmd_tags_file_load_metadata(GnomeCmdFile *f);
 
 #endif // __GNOME_CMD_TAGS_FILE_H__

Modified: trunk/src/tags/gnome-cmd-tags-poppler.cc
==============================================================================
--- trunk/src/tags/gnome-cmd-tags-poppler.cc	(original)
+++ trunk/src/tags/gnome-cmd-tags-poppler.cc	Tue Apr  7 17:35:28 2009
@@ -287,27 +287,27 @@
 #endif
 
 
-void gcmd_tags_poppler_load_metadata(GnomeCmdFile *finfo)
+void gcmd_tags_poppler_load_metadata(GnomeCmdFile *f)
 {
-    g_return_if_fail (finfo != NULL);
-    g_return_if_fail (finfo->info != NULL);
+    g_return_if_fail (f != NULL);
+    g_return_if_fail (f->info != NULL);
 
 #ifdef HAVE_PDF
-    if (finfo->metadata && finfo->metadata->is_accessed(TAG_PDF))  return;
+    if (f->metadata && f->metadata->is_accessed(TAG_PDF))  return;
 
-    if (!finfo->metadata)
-        finfo->metadata = new GnomeCmdFileMetadata;
+    if (!f->metadata)
+        f->metadata = new GnomeCmdFileMetadata;
 
-    if (!finfo->metadata)  return;
+    if (!f->metadata)  return;
 
-    finfo->metadata->mark_as_accessed(TAG_PDF);
+    f->metadata->mark_as_accessed(TAG_PDF);
 
-    if (!gnome_cmd_file_is_local (finfo))  return;
+    if (!gnome_cmd_file_is_local (f))  return;
 
     // skip non pdf files, as pdf metatags extraction is very expensive...
-    if (!strstr (finfo->info->mime_type, "pdf"))  return;
+    if (!strstr (f->info->mime_type, "pdf"))  return;
 
-    gchar *fname = gnome_cmd_file_get_real_path (finfo);
+    gchar *fname = gnome_cmd_file_get_real_path (f);
 
     DEBUG('t', "Loading PDF metadata for '%s'\n", fname);
 
@@ -318,34 +318,34 @@
     if (!doc.isOk())
         return;
 
-    finfo->metadata->mark_as_accessed(TAG_DOC);
+    f->metadata->mark_as_accessed(TAG_DOC);
 
-    finfo->metadata->addf(TAG_PDF_VERSION, "%.1f", doc.getPDFVersion());
-    finfo->metadata->addf(TAG_DOC_PAGECOUNT, "%i", doc.getNumPages());
-    finfo->metadata->addf(TAG_PDF_OPTIMIZED, "%u", doc.isLinearized());
-
-    finfo->metadata->addf(TAG_DOC_SECURITY, "%u", doc.isEncrypted());   //  FIXME: 1 -> "Password protected", 0 -> "No protection" ???
-
-    finfo->metadata->addf(TAG_PDF_PRINTING, "%u", doc.okToPrint());
-    finfo->metadata->addf(TAG_PDF_HIRESPRINTING, "%u", doc.okToPrintHighRes());
-    finfo->metadata->addf(TAG_PDF_MODIFYING, "%u", doc.okToChange());
-    finfo->metadata->addf(TAG_PDF_COPYING, "%u", doc.okToCopy());
-    finfo->metadata->addf(TAG_PDF_COMMENTING, "%u", doc.okToAddNotes());
-    finfo->metadata->addf(TAG_PDF_FORMFILLING, "%u", doc.okToFillForm());
-    finfo->metadata->addf(TAG_PDF_ACCESSIBILITYSUPPORT, "%u", doc.okToAccessibility());
-    finfo->metadata->addf(TAG_PDF_DOCASSEMBLY, "%u", doc.okToAssemble());
+    f->metadata->addf(TAG_PDF_VERSION, "%.1f", doc.getPDFVersion());
+    f->metadata->addf(TAG_DOC_PAGECOUNT, "%i", doc.getNumPages());
+    f->metadata->addf(TAG_PDF_OPTIMIZED, "%u", doc.isLinearized());
+
+    f->metadata->addf(TAG_DOC_SECURITY, "%u", doc.isEncrypted());   //  FIXME: 1 -> "Password protected", 0 -> "No protection" ???
+
+    f->metadata->addf(TAG_PDF_PRINTING, "%u", doc.okToPrint());
+    f->metadata->addf(TAG_PDF_HIRESPRINTING, "%u", doc.okToPrintHighRes());
+    f->metadata->addf(TAG_PDF_MODIFYING, "%u", doc.okToChange());
+    f->metadata->addf(TAG_PDF_COPYING, "%u", doc.okToCopy());
+    f->metadata->addf(TAG_PDF_COMMENTING, "%u", doc.okToAddNotes());
+    f->metadata->addf(TAG_PDF_FORMFILLING, "%u", doc.okToFillForm());
+    f->metadata->addf(TAG_PDF_ACCESSIBILITYSUPPORT, "%u", doc.okToAccessibility());
+    f->metadata->addf(TAG_PDF_DOCASSEMBLY, "%u", doc.okToAssemble());
 
     if (doc.getNumPages()>0)
     {
         double width = doc.getPageCropWidth(1)/72.0f*25.4f;
         double height = doc.getPageCropHeight(1)/72.0f*25.4f;
 
-        finfo->metadata->addf(TAG_PDF_PAGEWIDTH, "%.0f", width);
-        finfo->metadata->addf(TAG_PDF_PAGEHEIGHT, "%.0f", height);
+        f->metadata->addf(TAG_PDF_PAGEWIDTH, "%.0f", width);
+        f->metadata->addf(TAG_PDF_PAGEHEIGHT, "%.0f", height);
 
         gchar *paper_size = paper_name (width, height);
 
-        finfo->metadata->add(TAG_PDF_PAGESIZE, paper_size);
+        f->metadata->add(TAG_PDF_PAGESIZE, paper_size);
 
         g_free (paper_size);
     }
@@ -353,7 +353,7 @@
     Catalog *catalog = doc.getCatalog();
 
     if (catalog)
-        finfo->metadata->addf(TAG_PDF_EMBEDDEDFILES, "%i", catalog->numEmbeddedFiles());
+        f->metadata->addf(TAG_PDF_EMBEDDEDFILES, "%i", catalog->numEmbeddedFiles());
 
     // GooString *xmp = doc.readMetadata();         // FIXME: future access to XMP metadata
 
@@ -374,28 +374,28 @@
         Dict *dict = info.getDict();
 
         if (dict->lookup("Title", &obj)->isString())
-            add(*finfo->metadata, TAG_DOC_TITLE, obj.getString());
+            add(*f->metadata, TAG_DOC_TITLE, obj.getString());
 
         if (dict->lookup("Subject", &obj)->isString())
-            add(*finfo->metadata, TAG_DOC_SUBJECT, obj.getString());
+            add(*f->metadata, TAG_DOC_SUBJECT, obj.getString());
 
         if (dict->lookup("Keywords", &obj)->isString())
-            add(*finfo->metadata, TAG_DOC_KEYWORDS, TAG_FILE_KEYWORDS, obj.getString());        //  FIXME:  split keywords here
+            add(*f->metadata, TAG_DOC_KEYWORDS, TAG_FILE_KEYWORDS, obj.getString());        //  FIXME:  split keywords here
 
         if (dict->lookup("Author", &obj)->isString())
-            add(*finfo->metadata, TAG_DOC_AUTHOR, TAG_FILE_PUBLISHER, obj.getString());
+            add(*f->metadata, TAG_DOC_AUTHOR, TAG_FILE_PUBLISHER, obj.getString());
 
         if (dict->lookup("Creator", &obj)->isString())
-            add(*finfo->metadata, TAG_PDF_PRODUCER, obj.getString());
+            add(*f->metadata, TAG_PDF_PRODUCER, obj.getString());
 
         if (dict->lookup("Producer", &obj)->isString())
-            add(*finfo->metadata, TAG_DOC_GENERATOR, obj.getString());
+            add(*f->metadata, TAG_DOC_GENERATOR, obj.getString());
 
         if (dict->lookup("CreationDate", &obj)->isString())
-            add_date(*finfo->metadata, TAG_DOC_DATECREATED, obj.getString());
+            add_date(*f->metadata, TAG_DOC_DATECREATED, obj.getString());
 
         if (dict->lookup("ModDate", &obj)->isString())
-            add_date(*finfo->metadata, TAG_DOC_DATEMODIFIED, obj.getString());
+            add_date(*f->metadata, TAG_DOC_DATEMODIFIED, obj.getString());
 
         obj.free();
     }

Modified: trunk/src/tags/gnome-cmd-tags-poppler.h
==============================================================================
--- trunk/src/tags/gnome-cmd-tags-poppler.h	(original)
+++ trunk/src/tags/gnome-cmd-tags-poppler.h	Tue Apr  7 17:35:28 2009
@@ -26,6 +26,6 @@
 void gcmd_tags_poppler_init();
 void gcmd_tags_poppler_shutdown();
 
-void gcmd_tags_poppler_load_metadata(GnomeCmdFile *finfo);
+void gcmd_tags_poppler_load_metadata(GnomeCmdFile *f);
 
 #endif // __GNOME_CMD_TAGS_POPPLER_H__

Modified: trunk/src/tags/gnome-cmd-tags-taglib.h
==============================================================================
--- trunk/src/tags/gnome-cmd-tags-taglib.h	(original)
+++ trunk/src/tags/gnome-cmd-tags-taglib.h	Tue Apr  7 17:35:28 2009
@@ -26,6 +26,6 @@
 void gcmd_tags_taglib_init();
 inline void gcmd_tags_taglib_shutdown()     {}
 
-void gcmd_tags_taglib_load_metadata(GnomeCmdFile *finfo);
+void gcmd_tags_taglib_load_metadata(GnomeCmdFile *f);
 
 #endif // __GNOME_CMD_TAGS_TAGLIB_H__

Modified: trunk/src/tags/gnome-cmd-tags.cc
==============================================================================
--- trunk/src/tags/gnome-cmd-tags.cc	(original)
+++ trunk/src/tags/gnome-cmd-tags.cc	Tue Apr  7 17:35:28 2009
@@ -555,17 +555,17 @@
 }
 
 
-GnomeCmdFileMetadata *gcmd_tags_bulk_load(GnomeCmdFile *finfo)
+GnomeCmdFileMetadata *gcmd_tags_bulk_load(GnomeCmdFile *f)
 {
-    g_return_val_if_fail (finfo != NULL, NULL);
+    g_return_val_if_fail (f != NULL, NULL);
 
-    gcmd_tags_file_load_metadata(finfo);
-    gcmd_tags_exiv2_load_metadata(finfo);
-    gcmd_tags_taglib_load_metadata(finfo);
-    gcmd_tags_libgsf_load_metadata(finfo);
-    gcmd_tags_poppler_load_metadata(finfo);
+    gcmd_tags_file_load_metadata(f);
+    gcmd_tags_exiv2_load_metadata(f);
+    gcmd_tags_taglib_load_metadata(f);
+    gcmd_tags_libgsf_load_metadata(f);
+    gcmd_tags_poppler_load_metadata(f);
 
-    return finfo->metadata;
+    return f->metadata;
 }
 
 
@@ -718,9 +718,9 @@
 }
 
 
-const gchar *gcmd_tags_get_value(GnomeCmdFile *finfo, const GnomeCmdTag tag)
+const gchar *gcmd_tags_get_value(GnomeCmdFile *f, const GnomeCmdTag tag)
 {
-    g_return_val_if_fail (finfo != NULL, empty_string);
+    g_return_val_if_fail (f != NULL, empty_string);
 
     const gchar *ret_val = empty_string;
 
@@ -732,8 +732,8 @@
 #ifndef HAVE_EXIV2
                         return _(no_support_for_exiv2_tags_string);
 #endif
-                        gcmd_tags_exiv2_load_metadata(finfo);
-                        ret_val = finfo->metadata->operator [] (tag).c_str();
+                        gcmd_tags_exiv2_load_metadata(f);
+                        ret_val = f->metadata->operator [] (tag).c_str();
                         break;
 
         case TAG_AUDIO:
@@ -744,8 +744,8 @@
 #ifndef HAVE_ID3
                         return _(no_support_for_taglib_tags_string);
 #endif
-                        gcmd_tags_taglib_load_metadata(finfo);
-                        ret_val = finfo->metadata->operator [] (tag).c_str();
+                        gcmd_tags_taglib_load_metadata(f);
+                        ret_val = f->metadata->operator [] (tag).c_str();
                         break;
 
         case TAG_CHM  : break;
@@ -754,17 +754,17 @@
 #ifndef HAVE_GSF
                         return _(no_support_for_libgsf_tags_string);
 #endif
-                        gcmd_tags_libgsf_load_metadata(finfo);
+                        gcmd_tags_libgsf_load_metadata(f);
         case TAG_PDF  :
 #ifndef HAVE_PDF
                         return _(no_support_for_poppler_tags_string);
 #endif
-                        gcmd_tags_poppler_load_metadata(finfo);
-                        ret_val = finfo->metadata->operator [] (tag).c_str();
+                        gcmd_tags_poppler_load_metadata(f);
+                        ret_val = f->metadata->operator [] (tag).c_str();
                         break;
 
-        case TAG_FILE : gcmd_tags_file_load_metadata(finfo);
-                        ret_val = finfo->metadata->operator [] (tag).c_str();
+        case TAG_FILE : gcmd_tags_file_load_metadata(f);
+                        ret_val = f->metadata->operator [] (tag).c_str();
                         break;
 
         case TAG_RPM  : break;

Modified: trunk/src/tags/gnome-cmd-tags.h
==============================================================================
--- trunk/src/tags/gnome-cmd-tags.h	(original)
+++ trunk/src/tags/gnome-cmd-tags.h	Tue Apr  7 17:35:28 2009
@@ -483,12 +483,12 @@
 void gcmd_tags_init();
 void gcmd_tags_shutdown();
 
-GnomeCmdFileMetadata *gcmd_tags_bulk_load(GnomeCmdFile *finfo);
+GnomeCmdFileMetadata *gcmd_tags_bulk_load(GnomeCmdFile *f);
 
 const gchar *gcmd_tags_get_name(const GnomeCmdTag tag);
 const GnomeCmdTagClass gcmd_tags_get_class(const GnomeCmdTag tag);
 const gchar *gcmd_tags_get_class_name(const GnomeCmdTag tag);
-const gchar *gcmd_tags_get_value(GnomeCmdFile *finfo, const GnomeCmdTag tag);
+const gchar *gcmd_tags_get_value(GnomeCmdFile *f, const GnomeCmdTag tag);
 const gchar *gcmd_tags_get_title(const GnomeCmdTag tag);
 const gchar *gcmd_tags_get_description(const GnomeCmdTag tag);
 
@@ -500,11 +500,11 @@
 // gcmd_tags_get_value_by_name() returns metatag value for given tag_name (eg. AlbumArtist) in the specified tag_class (here TAG_AUDIO)
 // if tag_class is omitted, tag_name must contain fully qualified tag name (eg. Audio.AlbumArtist)
 
-inline const gchar *gcmd_tags_get_value_by_name(GnomeCmdFile *finfo, const gchar *tag_name, const GnomeCmdTagClass tag_class=TAG_NONE_CLASS)
+inline const gchar *gcmd_tags_get_value_by_name(GnomeCmdFile *f, const gchar *tag_name, const GnomeCmdTagClass tag_class=TAG_NONE_CLASS)
 {
-    g_return_val_if_fail (finfo != NULL, "");
+    g_return_val_if_fail (f != NULL, "");
 
-    return gcmd_tags_get_value(finfo, gcmd_tags_get_tag_by_name(tag_name, tag_class));
+    return gcmd_tags_get_value(f, gcmd_tags_get_tag_by_name(tag_name, tag_class));
 }
 
 



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