Author: andre
Date: 2010-03-26 17:46:18 +0100 (Fri, 26 Mar 2010)
New Revision: 41643
Modified:
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/Format.java
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/resources/formats.properties
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/resources/formats_nl.properties
Log:
applied some sense in upper- and lowercase, added m3u
Modified:
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/Format.java
===================================================================
---
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/Format.java
2010-03-26 16:27:01 UTC (rev 41642)
+++
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/Format.java
2010-03-26 16:46:18 UTC (rev 41643)
@@ -83,6 +83,10 @@
/* a few more audio formats */
AAC(200),
FLAC(201),
+
+ /* others */
+ M3U(501),
+ M3U8(502),
ANY(10000);
Modified:
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/resources/formats.properties
===================================================================
---
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/resources/formats.properties
2010-03-26 16:27:01 UTC (rev 41642)
+++
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/resources/formats.properties
2010-03-26 16:46:18 UTC (rev 41643)
@@ -1,16 +1,16 @@
UNKNOWN=Unknown
MP3=MP3 Audio
RA=Real Audio
-WAV=Wav
-PCM=Pcm
+WAV=WAV
+PCM=PCM
MP2=MPEG-2
-RM=Real Media
-VOB=Vob
-AVI=Avi
-MPEG=Mpeg
+RM=Real Media (rm)
+VOB=VOB
+AVI=AVI
+MPEG=MPEG
MP4=MPEG-4
MPG=MPG
-ASF=Windows media
+ASF=Windows media (asf)
MOV=QuickTime (mov)
WMA=Wmq
OGG=Ogg
@@ -29,13 +29,13 @@
WMZ=Windows media (wmz)
WMD=Windows media (wmd)
MID=Midi
-OGV=Ogg/Theora
-OGA=Ogg/Vorbis
+OGV=OGV (Theora)
+OGA=OGA (Vorbis)
PODCAST=Podcast
VODCAST=Vodcast
M4A=m4a
M4V=m4v
-TS=MPEG-Transport Stream
+TS=MPEG-Transport Stream (ts)
GGP=3ggp
FLASH=Flash
FLV=Flash Video
@@ -47,3 +47,5 @@
TIFF=TIFF image
AAC=Advanced Audio Coding
FLAC=FLAC (Free Lossless Audio Codec)
+M3U=Playlist (m3u)
+M3U8=Playlist (m3u8)
Modified:
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/resources/formats_nl.properties
===================================================================
---
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/resources/formats_nl.properties
2010-03-26 16:27:01 UTC (rev 41642)
+++
mmbase/branches/MMBase-1_9/applications/media/src/main/java/org/mmbase/applications/media/resources/formats_nl.properties
2010-03-26 16:46:18 UTC (rev 41643)
@@ -1,20 +1,20 @@
UNKNOWN=Unknown
MP3=MP3 Audio
RA=Real Audio
-WAV=Wav
-PCM=Pcm
+WAV=WAV
+PCM=PCM
MP2=MPEG-2
-RM=Real Media
-VOB=Vob
-AVI=Avi
-MPEG=Mpeg
+RM=Real Media (rm)
+VOB=VOB
+AVI=AVI
+MPEG=MPEG
MP4=MPEG-4
MPG=MPG
-ASF=Windows media
+ASF=Windows media (asf)
MOV=QuickTime (mov)
WMA=Wmq
OGG=Ogg
-OGM=Ogm
+OGM=Ogg Media
RAM=Real Media (ram)
WMP=Windows Media (wmp)
HTML=HTML
@@ -29,13 +29,13 @@
WMZ=Windows media (wmz)
WMD=Windows media (wmd)
MID=Midi
-OGV=Ogg/Theora
-OGA=Ogg/Vorbis
+OGV=OGV (Theora)
+OGA=OGA (Vorbis)
PODCAST=Podcast
VODCAST=Vodcast
M4A=m4a
M4V=m4v
-TS=MPEG-Transport Stream
+TS=MPEG-Transport Stream (ts)
GGP=3ggp
FLASH=Flash
FLV=Flash Video
@@ -47,3 +47,5 @@
TIFF=TIFF image
AAC=Advanced Audio Coding
FLAC=FLAC (Free Lossless Audio Codec)
+M3U=Playlist (m3u)
+M3U8=Playlist (m3u8)
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
