Mercurial Mercurial > upstream > oracle > spec-files / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/songbird-02-taglib.diff
author yippi
Mon, 27 Sep 2010 21:07:51 +0000
changeset 20108 51df67ca9307
parent 18110 93461edb1490
permissions -rw-r--r--
I had these modules listed as being owned by me, but they are really owned by wangke, correcting.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
18110
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     1
 
--- Songbird0.6/dependencies/vendor/taglib/taglib/ape/apetag.h.orig	Wed Jul 16 16:24:02 2008
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     2
 
+++ Songbird0.6/dependencies/vendor/taglib/taglib/ape/apetag.h	Wed Jul 16 16:23:46 2008
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     3
 
@@ -49,7 +49,7 @@
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     4
 
      *
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     5
 
      * \see APE::Tag::itemListMap()
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     6
 
      */
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     7
 
-    typedef Map<const String, Item> ItemListMap;
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     8
 
+    typedef Map<String, Item> ItemListMap;
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     9
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    10
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    11
 
     //! An APE tag implementation
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    12
 
--- Songbird1.4-vendor/dependencies/vendor/taglib/taglib/m4a/mp4file.cpp.orig	2010-01-05 13:17:49.269849989 -0800
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    13
 
+++ Songbird1.4-vendor/dependencies/vendor/taglib/taglib/m4a/mp4file.cpp	2010-01-05 13:18:11.272785153 -0800
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    14
 
@@ -46,6 +46,8 @@
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    15
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    16
 
 using namespace TagLib;
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    17
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    18
 
+#define __FUNCTION__ __FILE__ + __LINE__
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    19
 
+
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    20
 
 class MP4::File::FilePrivate
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    21
 
 {
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    22
 
 public:
upstream/oracle/spec-files