hrev53400 adds 2 changesets to branch 'master'
old head: 4eaa1f35e5e05b8f3b17cceaf32db6b68f85c28f
new head: ec6b0f4650185047bf7af591315bc6af15a5453b
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=ec6b0f465018+%5E4eaa1f35e5e0
----------------------------------------------------------------------------
805d7a776fa4: Add various module formats to the ffmpeg plugin
Change-Id: Ibc8cd6a21edc9f94f5c7cd51227868eb8bcbab01
Reviewed-on: https://review.haiku-os.org/c/haiku/+/1736
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
ec6b0f465018: Add various module formats to the mime-db
Change-Id: I3e3dc235d8146107aa45f356fdd03d66f6f69dba
Reviewed-on: https://review.haiku-os.org/c/haiku/+/1737
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
[ Zoltán Mizsei <zmizsei@xxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
3 files changed, 50 insertions(+)
src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp | 28 +++++++++++++++++++++
src/data/mime_db/audio/x-med | 11 ++++++++
src/data/mime_db/audio/x-mo3 | 11 ++++++++
############################################################################
Commit: 805d7a776fa4df3bb30581b826b370846a1bb4f7
URL: https://git.haiku-os.org/haiku/commit/?id=805d7a776fa4
Author: Zoltán Mizsei <zmizsei@xxxxxxxxxxxxx>
Date: Sat Aug 24 09:31:33 2019 UTC
Committer: waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Sat Aug 24 16:31:49 2019 UTC
Add various module formats to the ffmpeg plugin
Change-Id: Ibc8cd6a21edc9f94f5c7cd51227868eb8bcbab01
Reviewed-on: https://review.haiku-os.org/c/haiku/+/1736
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp
b/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp
index 3bcb6528c3..5971b56555 100644
--- a/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp
+++ b/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp
@@ -443,6 +443,34 @@ const media_file_format gMuxerTable[] = {
"mptm",
{ 0 }
},
+ {
+ media_file_format::B_READABLE
+ | media_file_format::B_KNOWS_RAW_AUDIO
+ | media_file_format::B_KNOWS_ENCODED_AUDIO,
+ { 0 },
+ B_MISC_FORMAT_FAMILY,
+ 100,
+ { 0 },
+ "audio/x-mo3",
+ "Compressed Tracker audio",
+ "mo3",
+ "mo3",
+ { 0 }
+ },
+ {
+ media_file_format::B_READABLE
+ | media_file_format::B_KNOWS_RAW_AUDIO
+ | media_file_format::B_KNOWS_ENCODED_AUDIO,
+ { 0 },
+ B_MISC_FORMAT_FAMILY,
+ 100,
+ { 0 },
+ "audio/x-med",
+ "Amiga MED/OctaMED Tracker Module",
+ "med",
+ "med",
+ { 0 }
+ },
};
const size_t gMuxerCount = sizeof(gMuxerTable) / sizeof(media_file_format);
############################################################################
Revision: hrev53400
Commit: ec6b0f4650185047bf7af591315bc6af15a5453b
URL: https://git.haiku-os.org/haiku/commit/?id=ec6b0f465018
Author: Zoltán Mizsei <zmizsei@xxxxxxxxxxxxx>
Date: Sat Aug 24 09:35:46 2019 UTC
Committer: waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Sat Aug 24 16:31:49 2019 UTC
Add various module formats to the mime-db
Change-Id: I3e3dc235d8146107aa45f356fdd03d66f6f69dba
Reviewed-on: https://review.haiku-os.org/c/haiku/+/1737
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/src/data/mime_db/audio/x-med b/src/data/mime_db/audio/x-med
new file mode 100644
index 0000000000..a70e3e65cd
--- /dev/null
+++ b/src/data/mime_db/audio/x-med
@@ -0,0 +1,11 @@
+
+resource(0, "BEOS:TYPE") #'MIMS' "application/x-vnd.Be-meta-mime";
+
+resource(1, "META:TYPE") "audio/x-med";
+
+resource(2, "META:S:DESC") #'MSDC' "Amiga MED/OctaMED Tracker Module";
+
+resource(3, "META:EXTENS") message(234) {
+ "extensions" = "med",
+ "type" = "audio/x-med"
+};
diff --git a/src/data/mime_db/audio/x-mo3 b/src/data/mime_db/audio/x-mo3
new file mode 100644
index 0000000000..62b6f83a67
--- /dev/null
+++ b/src/data/mime_db/audio/x-mo3
@@ -0,0 +1,11 @@
+
+resource(0, "BEOS:TYPE") #'MIMS' "application/x-vnd.Be-meta-mime";
+
+resource(1, "META:TYPE") "audio/x-mo3";
+
+resource(2, "META:S:DESC") #'MSDC' "Compressed Tracker audio";
+
+resource(3, "META:EXTENS") message(234) {
+ "extensions" = "mo3",
+ "type" = "audio/x-mo3"
+};