aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Panzenböck <grosser.meister.morti@gmx.net>2011-06-23 17:40:36 +0200
committerMathias Panzenböck <grosser.meister.morti@gmx.net>2011-06-23 17:40:36 +0200
commite810f2f61f8fb3a7da8d60209cc035b3712478b5 (patch)
tree04e0b0ee44a977c99a684c35b2727bd15a79a1a6
parent7236ef4d0f978ca950b569cb5d5913a3e7b05a38 (diff)
parentb2517aa4a0cb119457e8dc02a4bf973643f1f4f5 (diff)
Merge branch 'master' of https://github.com/taglib/taglib
-rw-r--r--bindings/c/tag_c.cpp4
-rw-r--r--taglib/mp4/mp4tag.cpp5
-rw-r--r--taglib/mp4/mp4tag.h1
3 files changed, 8 insertions, 2 deletions
diff --git a/bindings/c/tag_c.cpp b/bindings/c/tag_c.cpp
index 238af078..18a7861c 100644
--- a/bindings/c/tag_c.cpp
+++ b/bindings/c/tag_c.cpp
@@ -23,8 +23,6 @@
#include "config.h"
#endif
-#include "tag_c.h"
-
#include <stdlib.h>
#include <fileref.h>
#include <tfile.h>
@@ -42,6 +40,8 @@
#include <string.h>
#include <id3v2framefactory.h>
+#include "tag_c.h"
+
using namespace TagLib;
static List<char *> strings;
diff --git a/taglib/mp4/mp4tag.cpp b/taglib/mp4/mp4tag.cpp
index d7933dbb..30cb1028 100644
--- a/taglib/mp4/mp4tag.cpp
+++ b/taglib/mp4/mp4tag.cpp
@@ -47,6 +47,11 @@ public:
ItemListMap items;
};
+MP4::Tag::Tag()
+{
+ d = new TagPrivate;
+}
+
MP4::Tag::Tag(TagLib::File *file, MP4::Atoms *atoms)
{
d = new TagPrivate;
diff --git a/taglib/mp4/mp4tag.h b/taglib/mp4/mp4tag.h
index 3e6d667f..2c8b2df8 100644
--- a/taglib/mp4/mp4tag.h
+++ b/taglib/mp4/mp4tag.h
@@ -44,6 +44,7 @@ namespace TagLib {
class TAGLIB_EXPORT Tag: public TagLib::Tag
{
public:
+ Tag();
Tag(TagLib::File *file, Atoms *atoms);
~Tag();
bool save();