← Back to branch summary

~ubuntu-branches/ubuntu/wily/mediatomb/wily

« back to all changes in this revision

Viewing changes to debian/patches/config_xml_comment.patch

  • Committer: Package Import Robot
  • Author(s): Logan Rosen
  • Date: 2013-12-28 23:22:35 UTC
  • mfrom: (4.1.12 sid)
  • Revision ID: package-import@ubuntu.com-20131228232235-uhxpo82dnqa3cw95
Tags: 0.12.1-5ubuntu1
Merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/config_xml_comment.patch
1
 
Add comment about documentation for config.xml.
2
 
Also add mappings for matroska. Also add mappings for ogg in like manner as
3
 
audio files.
4
 
==========================================================================
5
 
---
6
 
 src/config_manager.cc  |   13 +++++++++++++
7
 
 src/metadata_handler.h |    2 ++
8
 
 2 files changed, 15 insertions(+)
9
 
 
10
 
Index: mediatomb-0.12.1/src/config_manager.cc
11
 
===================================================================
12
 
--- mediatomb-0.12.1.orig/src/config_manager.cc
13
 
+++ mediatomb-0.12.1/src/config_manager.cc
14
 
@@ -421,16 +421,23 @@
15
 
 
16
 
     String config_filename = homepath + DIR_SEPARATOR + DEFAULT_CONFIG_NAME;
17
 
 
18
 
     Ref<Element> config(new Element(_("config")));
19
 
     config->setAttribute(_("version"), String::from(CONFIG_XML_VERSION));
20
 
     config->setAttribute(_("xmlns"), _(XML_XMLNS) + CONFIG_XML_VERSION);
21
 
     config->setAttribute(_("xmlns:xsi"), _(XML_XMLNS_XSI));
22
 
     config->setAttribute(_("xsi:schemaLocation"), _(XML_XMLNS) + CONFIG_XML_VERSION + " " + XML_XMLNS + CONFIG_XML_VERSION + ".xsd");
23
 
+
24
 
+    Ref<Comment> docinfo(new Comment(_("\n\
25
 
+     Read /usr/share/doc/mediatomb-common/README.gz section 6 for more\n\
26
 
+     information on creating and using config.xml configration files.\n\
27
 
+    "), true));
28
 
+    config->appendChild(RefCast(docinfo, Node));
29
 
+
30
 
     Ref<Element> server(new Element(_("server")));
31
 
    
32
 
     Ref<Element> ui(new Element(_("ui")));
33
 
     ui->setAttribute(_("enabled"), _(DEFAULT_UI_EN_VALUE));
34
 
     ui->setAttribute(_("show-tooltips"), _(DEFAULT_UI_SHOW_TOOLTIPS_VALUE));
35
 
 
36
 
     Ref<Element>accounts(new Element(_("accounts")));
37
 
     accounts->setAttribute(_("enabled"), _(DEFAULT_ACCOUNTS_EN_VALUE));
38
 
@@ -609,16 +616,18 @@
39
 
 
40
 
     Ref<Element> mtupnp(new Element(_("mimetype-upnpclass")));
41
 
     mtupnp->appendElementChild(map_from_to(_("audio/*"), 
42
 
                                _(UPNP_DEFAULT_CLASS_MUSIC_TRACK)));
43
 
     mtupnp->appendElementChild(map_from_to(_("video/*"), 
44
 
                                _(UPNP_DEFAULT_CLASS_VIDEO_ITEM)));
45
 
     mtupnp->appendElementChild(map_from_to(_("image/*"), 
46
 
                                _("object.item.imageItem")));
47
 
+    mtupnp->appendElementChild(map_from_to(_("application/ogg"),
48
 
+                               _(UPNP_DEFAULT_CLASS_MUSIC_TRACK)));
49
 
 
50
 
     mappings->appendElementChild(mtupnp);
51
 
 
52
 
     Ref<Element> mtcontent(new Element(_("mimetype-contenttype")));
53
 
     mtcontent->appendElementChild(treat_as(_("audio/mpeg"), 
54
 
                                            _(CONTENT_TYPE_MP3)));
55
 
     mtcontent->appendElementChild(treat_as(_("application/ogg"), 
56
 
                                            _(CONTENT_TYPE_OGG)));
57
 
@@ -639,16 +648,20 @@
58
 
     mtcontent->appendElementChild(treat_as(_("video/mp4"), 
59
 
                                            _(CONTENT_TYPE_MP4)));
60
 
     mtcontent->appendElementChild(treat_as(_("audio/mp4"), 
61
 
                                            _(CONTENT_TYPE_MP4)));
62
 
     mtcontent->appendElementChild(treat_as(_("application/x-iso9660"), 
63
 
                                            _(CONTENT_TYPE_DVD)));
64
 
     mtcontent->appendElementChild(treat_as(_("application/x-iso9660-image"), 
65
 
                                            _(CONTENT_TYPE_DVD)));
66
 
+    mtcontent->appendElementChild(treat_as(_("video/x-matroska"),
67
 
+                                           _(CONTENT_TYPE_MKV)));
68
 
+    mtcontent->appendElementChild(treat_as(_("audio/x-matroska"),
69
 
+                                           _(CONTENT_TYPE_MKA)));
70
 
 
71
 
     mappings->appendElementChild(mtcontent);
72
 
     import->appendElementChild(mappings);
73
 
 
74
 
 #ifdef ONLINE_SERVICES
75
 
     import->appendElementChild(renderOnlineSection());
76
 
 #endif
77
 
 
78
 
Index: mediatomb-0.12.1/src/metadata_handler.h
79
 
===================================================================
80
 
--- mediatomb-0.12.1.orig/src/metadata_handler.h
81
 
+++ mediatomb-0.12.1/src/metadata_handler.h
82
 
@@ -52,16 +52,18 @@
83
 
 #define CONTENT_TYPE_JPG        "jpg"
84
 
 #define CONTENT_TYPE_PLAYLIST   "playlist"
85
 
 #define CONTENT_TYPE_MP4        "mp4"
86
 
 #define CONTENT_TYPE_PCM        "pcm"
87
 
 #define CONTENT_TYPE_AVI        "avi"
88
 
 #define CONTENT_TYPE_MPEG       "mpeg"
89
 
 #define CONTENT_TYPE_DVD        "dvd"
90
 
 #define CONTENT_TYPE_QUICKTIME  "quicktime"
91
 
+#define CONTENT_TYPE_MKV        "mkv"
92
 
+#define CONTENT_TYPE_MKA        "mka"
93
 
 
94
 
 #define OGG_THEORA              "t"
95
 
 
96
 
 #define RESOURCE_CONTENT_TYPE   "rct"
97
 
 #define RESOURCE_HANDLER        "rh"
98
 
 
99
 
 #define ID3_ALBUM_ART           "aa"
100
 
 #define EXIF_THUMBNAIL          "EX_TH"