summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2013-08-24 03:18:52 +0200
committerBastien Nocera <hadess@hadess.net>2013-08-24 03:23:29 +0200
commitf44b309d37a96536d42303cde580a8a91adb4365 (patch)
tree1b752acb8fb5065e8ed866d00137b2a04f20686a
parent015fff22f79b5e7d25c1f1db4898cea1e23d882b (diff)
downloadtotem-pl-parser-f44b309d37a96536d42303cde580a8a91adb4365.tar.gz
plparse: Remove totem-disc from the public API
It's ugly, with no async APIs, and plenty of gross stuff that we need to hide. https://bugzilla.gnome.org/show_bug.cgi?id=673589
-rw-r--r--docs/reference/Makefile.am1
-rw-r--r--docs/reference/totem-pl-parser-docs.xml1
-rw-r--r--docs/reference/totem-pl-parser-sections.txt19
-rw-r--r--plparse/Makefile.am7
4 files changed, 4 insertions, 24 deletions
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index fa970de..2e3c632 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -49,6 +49,7 @@ CFILE_GLOB=$(top_srcdir)/plparse/*.c
IGNORE_HFILES= \
bswap.h \
stamp-totem-pl-parser-builtins.h \
+ totem-disc.h \
totem-pl-parser-amz.h \
totem-pl-parser-builtins.h \
totem-pl-parser-features.h \
diff --git a/docs/reference/totem-pl-parser-docs.xml b/docs/reference/totem-pl-parser-docs.xml
index 2cac464..05e3257 100644
--- a/docs/reference/totem-pl-parser-docs.xml
+++ b/docs/reference/totem-pl-parser-docs.xml
@@ -18,7 +18,6 @@
<xi:include href="xml/totem-pl-parser.xml"/>
<xi:include href="xml/totem-pl-playlist.xml"/>
<xi:include href="xml/totem-pl-playlist-iter.xml"/>
- <xi:include href="xml/totem-disc.xml"/>
</chapter>
<index id="api-index-full">
diff --git a/docs/reference/totem-pl-parser-sections.txt b/docs/reference/totem-pl-parser-sections.txt
index 61ebba2..b8bede0 100644
--- a/docs/reference/totem-pl-parser-sections.txt
+++ b/docs/reference/totem-pl-parser-sections.txt
@@ -101,22 +101,3 @@ TOTEM_IS_PL_PLAYLIST_CLASS
<TITLE>TotemPlPlaylistIter</TITLE>
TotemPlPlaylistIter
</SECTION>
-
-<SECTION>
-<FILE>totem-disc</FILE>
-<TITLE>TotemDisc</TITLE>
-TotemDiscMediaType
-totem_cd_detect_type
-totem_cd_detect_type_with_url
-totem_cd_detect_type_from_dir
-totem_cd_get_human_readable_name
-totem_cd_mrl_from_type
-totem_cd_has_medium
-<SUBSECTION Standard>
-TOTEM_DISC_MEDIA_TYPE
-totem_disc_media_type_quark
-<SUBSECTION Private>
-MediaType
-MEDIA_TYPE_NUM_TYPES
-</SECTION>
-
diff --git a/plparse/Makefile.am b/plparse/Makefile.am
index 13ba011..6d0c716 100644
--- a/plparse/Makefile.am
+++ b/plparse/Makefile.am
@@ -18,7 +18,6 @@ plparserinclude_HEADERS = \
totem-pl-parser-features.h \
totem-pl-parser.h \
totem-pl-playlist.h \
- totem-disc.h \
totem-pl-parser-mini.h
plparser_sources = \
@@ -152,7 +151,7 @@ libtotem_plparser_mini_la_LDFLAGS = \
$(CODE_COVERAGE_LDFLAGS) \
$(AM_LDFLAGS)
-totem-pl-parser-builtins.h: totem-pl-parser.h totem-disc.h
+totem-pl-parser-builtins.h: totem-pl-parser.h
$(AM_V_GEN) ($(GLIB_MKENUMS) \
--fhead "#ifndef __TOTEM_PL_PARSER_BUILTINS_H__\n#define __TOTEM_PL_PARSER_BUILTINS_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
--fprod "/* enumerations from \"@filename@\" */\n" \
@@ -160,9 +159,9 @@ totem-pl-parser-builtins.h: totem-pl-parser.h totem-disc.h
--ftail "G_END_DECLS\n\n#endif /* __TOTEM_PL_PARSER_BUILTINS_H__ */" $^ > xgen-$(@F) \
&& mv -f xgen-$(@F) $@)
-totem-pl-parser-builtins.c: totem-pl-parser.h totem-disc.h totem-pl-parser-builtins.h
+totem-pl-parser-builtins.c: totem-pl-parser.h totem-pl-parser-builtins.h
$(AM_V_GEN) ($(GLIB_MKENUMS) \
- --fhead "#include \"totem-pl-parser.h\"\n#include \"totem-disc.h\"\n#include \"totem-pl-parser-builtins.h\"" \
+ --fhead "#include \"totem-pl-parser.h\"\n#include \"totem-pl-parser-builtins.h\"" \
--fprod "\n/* enumerations from \"@filename@\" */" \
--vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \