rev 3163 - people/dato/packages/trunk/amarok/debian/patches

[Adeodato Simó]

Author: adeodato
Date: 2006-02-19 19:00:18 +0000 (Sun, 19 Feb 2006)
New Revision: 3163

Modified:
   people/dato/packages/trunk/amarok/debian/patches/fix_m4a_ftbfs.diff
Log:
Use fix from r511393 instead.

Modified: people/dato/packages/trunk/amarok/debian/patches/fix_m4a_ftbfs.diff
===================================================================
--- people/dato/packages/trunk/amarok/debian/patches/fix_m4a_ftbfs.diff	2006-02-19 18:58:47 UTC (rev 3162)
+++ people/dato/packages/trunk/amarok/debian/patches/fix_m4a_ftbfs.diff	2006-02-19 19:00:18 UTC (rev 3163)
@@ -1,33 +1,33 @@
---- amarok/src/metadata/m4a/mp4audiosampleentry.cpp.orig
-+++ amarok/src/metadata/m4a/mp4audiosampleentry.cpp
-@@ -14,7 +14,7 @@
-   TagLib::uint bitrate;
- };
+--- amarok/src/metadata/m4a/mp4audiosampleentry.h.orig
++++ amarok/src/metadata/m4a/mp4audiosampleentry.h
+@@ -11,7 +11,7 @@
+     class Mp4AudioSampleEntry: public Mp4SampleEntry
+     {
+     public:
+-      Mp4AudioSampleEntry( File* file, MP4::Fourcc fourcc, uint size, long offset );
++      Mp4AudioSampleEntry( TagLib::File* file, MP4::Fourcc fourcc, uint size, long offset );
+       ~Mp4AudioSampleEntry();
  
--MP4::Mp4AudioSampleEntry::Mp4AudioSampleEntry( TagLib::File* file, MP4::Fourcc fourcc, uint size, long offset )
-+MP4::Mp4AudioSampleEntry::Mp4AudioSampleEntry( MP4::File* file, MP4::Fourcc fourcc, uint size, long offset )
- 	:Mp4SampleEntry(file, fourcc, size, offset)
- {
-   d = new MP4::Mp4AudioSampleEntry::Mp4AudioSampleEntryPrivate();
---- amarok/src/metadata/m4a/mp4sampleentry.cpp.orig
-+++ amarok/src/metadata/m4a/mp4sampleentry.cpp
-@@ -10,7 +10,7 @@
-   TagLib::uint data_reference_index;
- };
+       //! function to get the number of channels
+--- amarok/src/metadata/m4a/mp4sampleentry.h.orig
++++ amarok/src/metadata/m4a/mp4sampleentry.h
+@@ -11,7 +11,7 @@
+     class Mp4SampleEntry: public Mp4IsoBox
+     {
+     public:
+-      Mp4SampleEntry( File* file, MP4::Fourcc fourcc, uint size, long offset );
++      Mp4SampleEntry( TagLib::File* file, MP4::Fourcc fourcc, uint size, long offset );
+       ~Mp4SampleEntry();
  
--MP4::Mp4SampleEntry::Mp4SampleEntry( TagLib::File* file, MP4::Fourcc fourcc, uint size, long offset )
-+MP4::Mp4SampleEntry::Mp4SampleEntry( MP4::File* file, MP4::Fourcc fourcc, uint size, long offset )
- 	:Mp4IsoBox(file, fourcc, size, offset)
- {
-   d = new MP4::Mp4SampleEntry::Mp4SampleEntryPrivate();
---- amarok/src/metadata/m4a/mp4skipbox.cpp.orig
-+++ amarok/src/metadata/m4a/mp4skipbox.cpp
-@@ -9,7 +9,7 @@
- public:
- };
+     public:
+--- amarok/src/metadata/m4a/mp4skipbox.h.orig
++++ amarok/src/metadata/m4a/mp4skipbox.h
+@@ -11,7 +11,7 @@
+     class Mp4SkipBox: public Mp4IsoBox
+     {
+     public:
+-      Mp4SkipBox( File* file, MP4::Fourcc fourcc, uint size, long offset );
++      Mp4SkipBox( TagLib::File* file, MP4::Fourcc fourcc, uint size, long offset );
+       ~Mp4SkipBox();
  
--MP4::Mp4SkipBox::Mp4SkipBox( TagLib::File* file, MP4::Fourcc fourcc, uint size, long offset )
-+MP4::Mp4SkipBox::Mp4SkipBox( MP4::File* file, MP4::Fourcc fourcc, uint size, long offset )
- 	:Mp4IsoBox(file, fourcc, size, offset)
- {
-   d = new MP4::Mp4SkipBox::Mp4SkipBoxPrivate();
+     private: