Commits

shuerhaaken committed fa02b14

cleanup a little

Comments (0)

Files changed (3)

 AC_PREREQ([2.59])
 m4_define(libtaginfo_major_version, 0)
 m4_define(libtaginfo_minor_version, 0)
-m4_define(libtaginfo_micro_version, 10)
+m4_define(libtaginfo_micro_version, 11)
 m4_define(libtaginfo_version, libtaginfo_major_version.libtaginfo_minor_version.libtaginfo_micro_version)
 m4_define([libtaginfo_name], [libtaginfo])
 
         [libtaginfo_version], 
         [shuerhaaken@googlemail.com], 
         [libtaginfo],
-        [http://www.xnoise-media-player.com/])
+        [https://bitbucket.org/shuerhaaken/libtaginfo])
 
 AM_INIT_AUTOMAKE([1.11 -Wall no-define])
 AC_CONFIG_HEADERS([config.h libtaginfoconfig.h])
 AM_SILENT_RULES([yes])
 
 dnl ================================================================
-dnl       VAPIDIR is used to place the vapi file (vala binding)
-dnl       ${datadir}/vala/vapi is vala version independent
+dnl  VAPIDIR is used to place the vapi file (vala binding)
+dnl  ${datadir}/vala/vapi is vala version independent
 VAPIDIR="${datadir}/vala/vapi"
 AC_SUBST(VAPIDIR)
 dnl ================================================================
 echo "
 
   ${bold}${PACKAGE} ${VERSION}${normal}
-  ~~~~~~~~~~~~~
+  ~~~~~~~~~~~~~~~~~~
   
   ${bold}CONFIGURATION INFO${normal}
     Prefix:                        ${prefix}

libtaginfo/apeinfo.cc

  * http://www.gnu.org/copyleft/gpl.html
  */
 
-//#include "ape_internal.h"
 #include "taginfo.h"
 #include "taginfo_internal.h"
 
-
-using namespace TagInfo;
-using namespace TagLib;
-
-
-////#include <algorithm>
-////#include <fstream>
-////#include <stdio.h>
-////#include <string.h>
-////#include <vector>
-////#include <fcntl.h>
-////#include <unistd.h>
-////#include <iostream>
-
-
 #define APE_TAG_TITLE               "Title" 
-#define APE_TAG_SUBTITLE            "Subtitle" 
 #define APE_TAG_ARTIST              "Artist" 
+#define APE_TAG_ALBUMARTIST         "Album Artist" 
 #define APE_TAG_ALBUM               "Album" 
-#define APE_TAG_DEBUTALBUM          "Debut Album" 
-#define APE_TAG_PUBLISHER           "Publisher" 
-#define APE_TAG_CONDUCTOR           "Conductor" 
 #define APE_TAG_TRACK               "Track"
 #define APE_TAG_COMPOSER            "Composer" 
 #define APE_TAG_COMMENT             "Comment" 
-#define APE_TAG_COPYRIGHT           "Copyright" 
-#define APE_TAG_PUBLICATIONRIGHT    "Publicationright" 
 #define APE_TAG_FILE                "File" 
-#define APE_TAG_EANUPC              "EAN/UPC" 
-#define APE_TAG_ISBN                "ISBN" 
-#define APE_TAG_CATALOG             "Catalog"
-#define APE_TAG_LC                  "LC"
+#define APE_TAG_FILE_URL            "File URL" 
 #define APE_TAG_YEAR                "Year" 
-#define APE_TAG_RECORDDATE          "Record Date" 
-#define APE_TAG_RECORDLOCATION      "Record Location" 
 #define APE_TAG_GENRE               "Genre" 
 #define APE_TAG_MEDIA               "Media" 
 #define APE_TAG_INDEX               "Index" 
-#define APE_TAG_RELATED_URL         "Related" 
-#define APE_TAG_ISRC                "ISRC" 
-#define APE_TAG_ABSTRACT_URL        "Abstract" 
-#define APE_TAG_LANGUAGE            "Language" 
-#define APE_TAG_BIBLIOGRAPHY_URL    "Bibliography" 
-#define APE_TAG_INTROPLAY           "Introplay" 
-#define APE_TAG_DUMMY               "Dummy" 
-
 #define APE_TAG_COVER_ART_FRONT     "Cover Art (front)" 
 #define APE_TAG_COVER_ART_OTHER     "Cover Art (other)" 
 #define APE_TAG_NOTES               "Notes" 
 #define APE_TAG_LYRICS              "Lyrics" 
-#define APE_TAG_BUY_URL             "Buy URL" 
-#define APE_TAG_ARTIST_URL          "Artist URL" 
-#define APE_TAG_PUBLISHER_URL       "Publisher URL" 
-#define APE_TAG_FILE_URL            "File URL" 
-#define APE_TAG_COPYRIGHT_URL       "Copyright URL" 
-#define APE_TAG_MJ_METADATA         "Media Jukebox Metadata" 
 
-#define APE_TAG_ALBUMARTIST         "Album Artist" 
+using namespace TagInfo;
+using namespace TagLib;
 
-#define APE_FLAG_CONTENT_TYPE        0x00000006
-#define APE_FLAG_CONTENT_TEXT        0x00000000
-#define APE_FLAG_CONTENT_BINARY      0x00000002
-#define APE_FLAG_CONTENT_EXTERNAL    0x00000004
 
 
-ApeInfo::ApeInfo(const string &filename) : Info(filename) { //, ape_file(filename)
+ApeInfo::ApeInfo(const string &filename) : Info(filename) {
     if(!file_name.isEmpty() && !create_file_ref())
         printf("Error creating file ref! %s\n", filename.c_str());
     if(taglib_file) {
 
 
 bool ApeInfo::set_lyrics(const String &lyrics) {
-//    if(changedflag & CHANGED_DATA_LYRICS)
     taglib_apetag->addValue(APE_TAG_LYRICS, lyrics);
     return Info::write();
 }

libtaginfo/taginfo.h

 #include <apefile.h>
 #include <id3v2tag.h>
 
-#define NOT_FOUND -1
 
 using namespace TagLib;
 using namespace std;
 
 
 
-
-
 namespace TagInfo {
     
     enum MediaFileType {