Skip to content

Instantly share code, notes, and snippets.

@scotchi
Created October 15, 2011 08:51
Show Gist options
  • Save scotchi/1289293 to your computer and use it in GitHub Desktop.
Save scotchi/1289293 to your computer and use it in GitHub Desktop.
Diff of TagLib 1.5 and the version from the Amazon Kindle
diff -ur -x 'Makefile*' -x 'config*' -x '*.cache' -x aclocal.m4 taglib-1.5/bindings/c/tag_c.cpp gplrelease/taglib-1.5/bindings/c/tag_c.cpp
--- taglib-1.5/bindings/c/tag_c.cpp 2008-02-12 05:43:44.000000000 +0100
+++ gplrelease/taglib-1.5/bindings/c/tag_c.cpp 2011-09-28 05:57:55.000000000 +0200
@@ -28,10 +28,10 @@
#include <mpegfile.h>
#include <flacfile.h>
#include <oggflacfile.h>
-#include <mpcfile.h>
-#include <wavpackfile.h>
-#include <speexfile.h>
-#include <trueaudiofile.h>
+//#include <mpcfile.h>
+//#include <wavpackfile.h>
+//#include <speexfile.h>
+//#include <trueaudiofile.h>
#include <tag.h>
#include <string.h>
#include <id3v2framefactory.h>
@@ -70,16 +70,16 @@
return reinterpret_cast<TagLib_File *>(new Ogg::Vorbis::File(filename));
case TagLib_File_FLAC:
return reinterpret_cast<TagLib_File *>(new FLAC::File(filename));
- case TagLib_File_MPC:
- return reinterpret_cast<TagLib_File *>(new MPC::File(filename));
+// case TagLib_File_MPC:
+// return reinterpret_cast<TagLib_File *>(new MPC::File(filename));
case TagLib_File_OggFlac:
return reinterpret_cast<TagLib_File *>(new Ogg::FLAC::File(filename));
- case TagLib_File_WavPack:
- return reinterpret_cast<TagLib_File *>(new WavPack::File(filename));
- case TagLib_File_Speex:
- return reinterpret_cast<TagLib_File *>(new Ogg::Speex::File(filename));
- case TagLib_File_TrueAudio:
- return reinterpret_cast<TagLib_File *>(new TrueAudio::File(filename));
+// case TagLib_File_WavPack:
+// return reinterpret_cast<TagLib_File *>(new WavPack::File(filename));
+// case TagLib_File_Speex:
+// return reinterpret_cast<TagLib_File *>(new Ogg::Speex::File(filename));
+// case TagLib_File_TrueAudio:
+// return reinterpret_cast<TagLib_File *>(new TrueAudio::File(filename));
}
return 0;
diff -ur -x 'Makefile*' -x 'config*' -x '*.cache' -x aclocal.m4 taglib-1.5/taglib/fileref.cpp gplrelease/taglib-1.5/taglib/fileref.cpp
--- taglib-1.5/taglib/fileref.cpp 2008-02-12 21:46:24.000000000 +0100
+++ gplrelease/taglib-1.5/taglib/fileref.cpp 2011-09-28 05:57:55.000000000 +0200
@@ -29,12 +29,12 @@
#include "fileref.h"
#include "mpegfile.h"
#include "vorbisfile.h"
-#include "flacfile.h"
+//#include "flacfile.h"
#include "oggflacfile.h"
-#include "mpcfile.h"
-#include "wavpackfile.h"
-#include "speexfile.h"
-#include "trueaudiofile.h"
+//#include "mpcfile.h"
+//#include "wavpackfile.h"
+//#include "speexfile.h"
+//#include "trueaudiofile.h"
using namespace TagLib;
@@ -114,13 +114,13 @@
StringList l;
l.append("ogg");
- l.append("flac");
+// l.append("flac");
l.append("oga");
l.append("mp3");
- l.append("mpc");
- l.append("wv");
- l.append("spx");
- l.append("tta");
+// l.append("mpc");
+// l.append("wv");
+// l.append("spx");
+// l.append("tta");
return l;
}
@@ -187,16 +187,16 @@
return new MPEG::File(fileName, readAudioProperties, audioPropertiesStyle);
if(s.substr(s.size() - 4, 4).upper() == ".OGA")
return new Ogg::FLAC::File(fileName, readAudioProperties, audioPropertiesStyle);
- if(s.substr(s.size() - 5, 5).upper() == ".FLAC")
- return new FLAC::File(fileName, readAudioProperties, audioPropertiesStyle);
- if(s.substr(s.size() - 4, 4).upper() == ".MPC")
- return new MPC::File(fileName, readAudioProperties, audioPropertiesStyle);
- if(s.substr(s.size() - 3, 3).upper() == ".WV")
- return new WavPack::File(fileName, readAudioProperties, audioPropertiesStyle);
- if(s.substr(s.size() - 4, 4).upper() == ".SPX")
- return new Ogg::Speex::File(fileName, readAudioProperties, audioPropertiesStyle);
- if(s.substr(s.size() - 4, 4).upper() == ".TTA")
- return new TrueAudio::File(fileName, readAudioProperties, audioPropertiesStyle);
+// if(s.substr(s.size() - 5, 5).upper() == ".FLAC")
+// return new FLAC::File(fileName, readAudioProperties, audioPropertiesStyle);
+// if(s.substr(s.size() - 4, 4).upper() == ".MPC")
+// return new MPC::File(fileName, readAudioProperties, audioPropertiesStyle);
+// if(s.substr(s.size() - 3, 3).upper() == ".WV")
+// return new WavPack::File(fileName, readAudioProperties, audioPropertiesStyle);
+// if(s.substr(s.size() - 4, 4).upper() == ".SPX")
+// return new Ogg::Speex::File(fileName, readAudioProperties, audioPropertiesStyle);
+// if(s.substr(s.size() - 4, 4).upper() == ".TTA")
+// return new TrueAudio::File(fileName, readAudioProperties, audioPropertiesStyle);
}
return 0;
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment