summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-06-28 06:58:51 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-06-28 06:58:51 +0000
commit122cdcf45f871dbcaea70626be8544e4feac4d43 (patch)
tree7f94efe2af587b965ebeb0efb10581987ddad073 /media-sound/kid3/files
parentold (diff)
downloadhistorical-122cdcf45f871dbcaea70626be8544e4feac4d43.tar.gz
historical-122cdcf45f871dbcaea70626be8544e4feac4d43.tar.bz2
historical-122cdcf45f871dbcaea70626be8544e4feac4d43.zip
old
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'media-sound/kid3/files')
-rw-r--r--media-sound/kid3/files/kid3-1.3-compile-without-vorbis.patch105
1 files changed, 0 insertions, 105 deletions
diff --git a/media-sound/kid3/files/kid3-1.3-compile-without-vorbis.patch b/media-sound/kid3/files/kid3-1.3-compile-without-vorbis.patch
deleted file mode 100644
index fcc3416caaaa..000000000000
--- a/media-sound/kid3/files/kid3-1.3-compile-without-vorbis.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff -ur kid3-1.3-orig/kid3/oggfile.cpp kid3-1.3/kid3/oggfile.cpp
---- kid3-1.3-orig/kid3/oggfile.cpp 2009-09-20 12:22:55.000000000 +0300
-+++ kid3-1.3/kid3/oggfile.cpp 2009-11-23 15:23:24.992619259 +0200
-@@ -636,6 +636,49 @@
- }
-
- /**
-+ * Read information about an Ogg/Vorbis file.
-+ * @param fn file name
-+ * @return true if ok.
-+ */
-+bool OggFile::FileInfo::read(const char* fn)
-+{
-+ valid = false;
-+ FILE* fp = ::fopen(fn, "rb");
-+ if (fp) {
-+ OggVorbis_File vf;
-+ if (::ov_open(fp, &vf, NULL, 0) == 0) {
-+ vorbis_info* vi = ::ov_info(&vf, -1);
-+ if (vi) {
-+ valid = true;
-+ version = vi->version;
-+ channels = vi->channels;
-+ sampleRate = vi->rate;
-+ bitrate = vi->bitrate_nominal;
-+ if (bitrate <= 0) {
-+ bitrate = vi->bitrate_upper;
-+ }
-+ if (bitrate <= 0) {
-+ bitrate = vi->bitrate_lower;
-+ }
-+ }
-+#ifdef WIN32
-+ duration = (long)::ov_time_total(&vf, -1);
-+#else
-+ duration = ::lrint(::ov_time_total(&vf, -1));
-+#endif
-+ ::ov_clear(&vf); // closes file, do not use ::fclose()
-+ } else {
-+ ::fclose(fp);
-+ }
-+ }
-+ return valid;
-+}
-+#else // HAVE_VORBIS
-+void OggFile::getDetailInfo(DetailInfo& info) const { info.valid = false; }
-+unsigned OggFile::getDuration() const { return 0; }
-+#endif // HAVE_VORBIS
-+
-+/**
- * Get the format of tag 2.
- *
- * @return "Vorbis".
-@@ -809,51 +852,6 @@
- return lst;
- }
-
--
--
--/**
-- * Read information about an Ogg/Vorbis file.
-- * @param fn file name
-- * @return true if ok.
-- */
--bool OggFile::FileInfo::read(const char* fn)
--{
-- valid = false;
-- FILE* fp = ::fopen(fn, "rb");
-- if (fp) {
-- OggVorbis_File vf;
-- if (::ov_open(fp, &vf, NULL, 0) == 0) {
-- vorbis_info* vi = ::ov_info(&vf, -1);
-- if (vi) {
-- valid = true;
-- version = vi->version;
-- channels = vi->channels;
-- sampleRate = vi->rate;
-- bitrate = vi->bitrate_nominal;
-- if (bitrate <= 0) {
-- bitrate = vi->bitrate_upper;
-- }
-- if (bitrate <= 0) {
-- bitrate = vi->bitrate_lower;
-- }
-- }
--#ifdef WIN32
-- duration = (long)::ov_time_total(&vf, -1);
--#else
-- duration = ::lrint(::ov_time_total(&vf, -1));
--#endif
-- ::ov_clear(&vf); // closes file, do not use ::fclose()
-- } else {
-- ::fclose(fp);
-- }
-- }
-- return valid;
--}
--#else // HAVE_VORBIS
--void OggFile::getDetailInfo(DetailInfo& info) const { info.valid = false; }
--unsigned OggFile::getDuration() const { return 0; }
--#endif // HAVE_VORBIS
--
- /**
- * Get value.
- * @param name name