From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 3 Mar 2014 14:38:31 +0000 (+0100)
Subject: Encoder : fix some names and mimetypes
X-Git-Tag: 0.5.5~3^2~4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=846882421df6a9d6f69fdc95a7e850c72250670c;p=timeside.git

Encoder : fix some names and mimetypes
---

diff --git a/timeside/encoder/mp3.py b/timeside/encoder/mp3.py
index a69b6e5..eee74cf 100644
--- a/timeside/encoder/mp3.py
+++ b/timeside/encoder/mp3.py
@@ -32,7 +32,7 @@ from timeside.api import IEncoder
 
 
 class Mp3Encoder(GstEncoder):
-    """ gstreamer-based mp3 encoder """
+    """ gstreamer-based MP3 encoder """
     implements(IEncoder)
 
     @interfacedoc
diff --git a/timeside/encoder/ogg.py b/timeside/encoder/ogg.py
index 32f309b..e56741f 100644
--- a/timeside/encoder/ogg.py
+++ b/timeside/encoder/ogg.py
@@ -25,7 +25,7 @@ from timeside.api import IEncoder
 from timeside.tools import *
 
 class VorbisEncoder(GstEncoder):
-    """ gstreamer-based vorbis encoder """
+    """ gstreamer-based OGG Vorbis encoder """
     implements(IEncoder)
 
     @interfacedoc
diff --git a/timeside/encoder/opus.py b/timeside/encoder/opus.py
index c2e379d..76ebe7f 100644
--- a/timeside/encoder/opus.py
+++ b/timeside/encoder/opus.py
@@ -31,7 +31,7 @@ from timeside.api import IEncoder
 
 
 class OpusEncoder(GstEncoder):
-    """ gstreamer-based mp3 encoder """
+    """ gstreamer-based Opus encoder """
     implements(IEncoder)
 
     @interfacedoc
@@ -82,7 +82,7 @@ class OpusEncoder(GstEncoder):
     @staticmethod
     @interfacedoc
     def mime_type():
-        return "audio/mpeg"
+        return "audio/ogg"
 
     @interfacedoc
     def set_metadata(self, metadata):
diff --git a/timeside/encoder/wav.py b/timeside/encoder/wav.py
index 32666e7..69d5557 100644
--- a/timeside/encoder/wav.py
+++ b/timeside/encoder/wav.py
@@ -27,7 +27,7 @@ from timeside.tools import *
 
 
 class WavEncoder(GstEncoder):
-    """ gstreamer-based encoder """
+    """ gstreamer-based WAV encoder """
     implements(IEncoder)
 
     @interfacedoc
diff --git a/timeside/encoder/webm.py b/timeside/encoder/webm.py
index ab004fe..5ff9594 100644
--- a/timeside/encoder/webm.py
+++ b/timeside/encoder/webm.py
@@ -26,7 +26,7 @@ from timeside.tools import *
 
 
 class WebMEncoder(GstEncoder):
-    """ gstreamer-based webm encoder and muxer """
+    """ gstreamer-based WebM encoder """
     implements(IEncoder)
 
     def __init__(self, output, streaming=False, overwrite=False, video=False):
@@ -71,7 +71,7 @@ class WebMEncoder(GstEncoder):
     @staticmethod
     @interfacedoc
     def description():
-        return "WebM GStreamer based encoder and muxer"
+        return "WebM GStreamer based encoder"
 
     @staticmethod
     @interfacedoc