MP4: do not depend on id3tag plugin

diff --git a/modules/demux/mp4/Modules.am b/modules/demux/mp4/Modules.am
index 34ee3bde0e20ec197c1a6e852c27f4c7c26ea903..17fdb736e872d50eb418d0ad70b3b70d9d822f36 100644 (file)
--- a/modules/demux/mp4/Modules.am
+++ b/modules/demux/mp4/Modules.am
@@ -5,6 +5,7 @@ SOURCES_mp4 = \
        drms.c \
        drms.h \
        drmstables.h \
+       id3genres.h \
        $(NULL)
 
 libvlc_LTLIBRARIES += libmp4_plugin.la

diff --git a/modules/demux/mp4/id3genres.h b/modules/demux/mp4/id3genres.h
new file mode 100644 (file)
index 0000000..4f9d648
--- /dev/null
+++ b/modules/demux/mp4/id3genres.h
@@ -0,0 +1,108 @@
+/*****************************************************************************
+ * id3genres.h: list of genres for id3 genre tags
+ *****************************************************************************
+ * Copyright (C) 2002-2003 the VideoLAN team
+ * $Id$
+ *
+ * Author: Sigmund Augdal Helberg <dnumgis@videolan.org>
+ *         list found at http://www.id3.org/id3v2.4.0-frames.txt
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#define NUM_GENRES 80
+
+static const char *ppsz_genres[] = {
+    N_("Blues"),
+    N_("Classic rock"),
+    N_("Country"),
+    N_("Dance"),
+    N_("Disco"),
+    N_("Funk"),
+    N_("Grunge"),
+    N_("Hip-Hop"),
+    N_("Jazz"),
+    N_("Metal"),
+    N_("New Age"),
+    N_("Oldies"),
+    N_("Other"),
+    N_("Pop"),
+    N_("R&B"),
+    N_("Rap"),
+    N_("Reggae"),
+    N_("Rock"),
+    N_("Techno"),
+    N_("Industrial"),
+    N_("Alternative"),
+    N_("Ska"),
+    N_("Death metal"),
+    N_("Pranks"),
+    N_("Soundtrack"),
+    N_("Euro-Techno"),
+    N_("Ambient"),
+    N_("Trip-Hop"),
+    N_("Vocal"),
+    N_("Jazz+Funk"),
+    N_("Fusion"),
+    N_("Trance"),
+    N_("Classical"),
+    N_("Instrumental"),
+    N_("Acid"),
+    N_("House"),
+    N_("Game"),
+    N_("Sound clip"),
+    N_("Gospel"),
+    N_("Noise"),
+    N_("Alternative rock"),
+    N_("Bass"),
+    N_("Soul"),
+    N_("Punk"),
+    N_("Space"),
+    N_("Meditative"),
+    N_("Instrumental pop"),
+    N_("Instrumental rock"),
+    N_("Ethnic"),
+    N_("Gothic"),
+    N_("Darkwave"),
+    N_("Techno-Industrial"),
+    N_("Electronic"),
+    N_("Pop-Folk"),
+    N_("Eurodance"),
+    N_("Dream"),
+    N_("Southern rock"),
+    N_("Comedy"),
+    N_("Cult"),
+    N_("Gangsta"),
+    N_("Top 40"),
+    N_("Christian rap"),
+    N_("Pop/funk"),
+    N_("Jungle"),
+    N_("Native American"),
+    N_("Cabaret"),
+    N_("New wave"),
+    N_("Psychedelic"),
+    N_("Rave"),
+    N_("Showtunes"),
+    N_("Trailer"),
+    N_("Lo-Fi"),
+    N_("Tribal"),
+    N_("Acid punk"),
+    N_("Acid jazz"),
+    N_("Polka"),
+    N_("Retro"),
+    N_("Musical"),
+    N_("Rock & roll"),
+    N_("Hard rock")
+};

diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index 592dd9461bb7e7deea1e72f3a5a380cbb0b86abf..13b87f04a08f9434251d70eba43953d1a1315553 100644 (file)
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -41,7 +41,7 @@
 
 #include "libmp4.h"
 #include "drms.h"
-#include "../../meta_engine/id3genres.h"
+#include "id3genres.h"
 
 /*****************************************************************************
  * Module descriptor

diff --git a/po/POTFILES.in b/po/POTFILES.in
index e2e1292e5564fb0c6b6d15206e4171bcc699daa0..3fbb7d1baad0c33d795b18b1ffa90dee5f172346 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -484,6 +484,7 @@ modules/demux/mod.c
 modules/demux/mp4/drms.c
 modules/demux/mp4/drms.h
 modules/demux/mp4/drmstables.h
+modules/demux/mp4/id3genres.h
 modules/demux/mp4/libmp4.c
 modules/demux/mp4/libmp4.h
 modules/demux/mp4/mp4.c
@@ -910,7 +911,6 @@ modules/gui/skins2/x11/x11_tooltip.hpp
 modules/gui/skins2/x11/x11_window.cpp
 modules/gui/skins2/x11/x11_window.hpp
 modules/meta_engine/folder.c
-modules/meta_engine/id3genres.h
 modules/meta_engine/id3tag.c
 modules/meta_engine/taglib.cpp
 modules/misc/audioscrobbler.c