summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-01 21:10:55 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-01 21:10:55 -0500
commit0ecfaa944652fa9b7a632e6135741c4b9f473a20 (patch)
treef47e4c4ce33600ca125928280edeb01ac31d8af3
parent68cff160cbf2fb0b4865f2b74bb49b8fa1a2a657 (diff)
downloadtdemultimedia-0ecfaa944652fa9b7a632e6135741c4b9f473a20.tar.gz
tdemultimedia-0ecfaa944652fa9b7a632e6135741c4b9f473a20.zip
Add flv video mimetype to supported lists for xine engine and kaboodle
This relates to Bug 1908
-rw-r--r--kaboodle/kaboodle.desktop2
-rw-r--r--kaboodle/kaboodle_component.desktop2
-rw-r--r--kaboodle/kaboodleengine.desktop2
-rw-r--r--xine_artsplugin/xineVideoPlayObject.mcopclass2
4 files changed, 4 insertions, 4 deletions
diff --git a/kaboodle/kaboodle.desktop b/kaboodle/kaboodle.desktop
index 345ce9fa..626deca4 100644
--- a/kaboodle/kaboodle.desktop
+++ b/kaboodle/kaboodle.desktop
@@ -12,7 +12,7 @@ Icon=kaboodle
X-TDE-StartupNotify=true
Type=Application
# Keep in sync with the audio types in kaboodle_component.desktop
-MimeType=audio/x-mp3;application/ogg;audio/x-mp2;video/mpeg;audio/x-wav;audio/x-mod;video/x-msvideo;video/quicktime;video/x-flic;audio/basic;video/x-ms-asf;
+MimeType=audio/x-mp3;application/ogg;audio/x-mp2;video/mpeg;audio/x-wav;audio/x-mod;video/x-msvideo;video/quicktime;video/x-flic;audio/basic;video/x-ms-asf;video/x-flv;
GenericName=Media Player
GenericName[af]=Media Speler
GenericName[ar]=مشغل وسائط
diff --git a/kaboodle/kaboodle_component.desktop b/kaboodle/kaboodle_component.desktop
index e0d82406..9088315d 100644
--- a/kaboodle/kaboodle_component.desktop
+++ b/kaboodle/kaboodle_component.desktop
@@ -66,7 +66,7 @@ Name[zu]=Oxubiwe Umdlai Wezezindaba
X-TDE-Library=libkaboodlepart
Icon=kaboodle
# Keep in sync with the audio types in kaboodle.desktop
-MimeType=audio/x-mp3;application/ogg;audio/x-mp2;video/mpeg;audio/x-wav;audio/x-mod;video/x-msvideo;video/quicktime;video/x-flic;audio/basic;video/x-ms-asf
+MimeType=audio/x-mp3;application/ogg;audio/x-mp2;video/mpeg;audio/x-wav;audio/x-mod;video/x-msvideo;video/quicktime;video/x-flic;audio/basic;video/x-ms-asf;video/x-flv
ServiceTypes=KParts/ReadOnlyPart,Browser/View,KMediaPlayer/Player
Type=Service
InitialPreference=8
diff --git a/kaboodle/kaboodleengine.desktop b/kaboodle/kaboodleengine.desktop
index 1d94d28d..a8d62a52 100644
--- a/kaboodle/kaboodleengine.desktop
+++ b/kaboodle/kaboodleengine.desktop
@@ -61,7 +61,7 @@ Name[zu]=Injini Yomdlali Womculom Ohlanganisiwe
X-TDE-Library=libkaboodlepart
Icon=kaboodle
# Keep in sync with the audio types in kaboodle.desktop
-MimeType=audio/x-mp3;application/ogg;audio/x-mp2;video/mpeg;audio/x-wav;audio/x-mod;video/x-msvideo;video/quicktime;video/x-flic;audio/basic;video/x-ms-asf
+MimeType=audio/x-mp3;application/ogg;audio/x-mp2;video/mpeg;audio/x-wav;audio/x-mod;video/x-msvideo;video/quicktime;video/x-flic;audio/basic;video/x-ms-asf;video/x-flv
ServiceTypes=KMediaPlayer/Engine
Type=Service
InitialPreference=8
diff --git a/xine_artsplugin/xineVideoPlayObject.mcopclass b/xine_artsplugin/xineVideoPlayObject.mcopclass
index 5863fcf1..eee1d12d 100644
--- a/xine_artsplugin/xineVideoPlayObject.mcopclass
+++ b/xine_artsplugin/xineVideoPlayObject.mcopclass
@@ -1,7 +1,7 @@
Interface=xinePlayObject,Arts::PlayObject,Arts::VideoPlayObject,Arts::SynthModule
Author=Ewald Snel <ewald@rambo.its.tudelft.nl>
Extension=vob,mpg,mpeg,m1v,m2v,m4v,m1s,m2s,m2p,avi,asf,asx,wmv,qt,mov,moov,mp4,rv,ram,rm,smi,ogm
-MimeType=video/x-mpg,video/x-dat,video/x-mpeg,video/mpeg,video/x-msvideo,video/x-ms-asf,video/x-ms-wmv,video/quicktime,video/x-theora,video/mp4,video/x-ogm,application/vnd.ms-asf,application/vnd.rn-realmedia,video/vnd.rn-realvideo,application/ogg
+MimeType=video/x-mpg,video/x-dat,video/x-mpeg,video/mpeg,video/x-msvideo,video/x-ms-asf,video/x-ms-wmv,video/quicktime,video/x-theora,video/mp4,video/x-ogm,application/vnd.ms-asf,application/vnd.rn-realmedia,video/vnd.rn-realvideo,application/ogg,video/x-flv
Language=C++
Library=libarts_xine.la
Preference=4