diff --git a/src/devede/avconv_converter.py b/src/devede/avconv.py similarity index 99% rename from src/devede/avconv_converter.py rename to src/devede/avconv.py index 62c3f6a..d98b25f 100644 --- a/src/devede/avconv_converter.py +++ b/src/devede/avconv.py @@ -24,7 +24,7 @@ import devede.executor import devede.mux_dvd_menu import devede.avconv_converter -class avconv_converter(devede.executor.executor): +class avconv(devede.executor.executor): supports_analize = False supports_play = False @@ -113,7 +113,7 @@ class avconv_converter(devede.executor.executor): else: self.text = _("Converting %(X)s (pass 1)") % {"X" : file_project.title_name} # Prepare the converting process for the second pass - tmp = devede.avconv_converter.avconv_converter() + tmp = devede.avconv.avconv() tmp.convert_file(file_project, output_file, video_length, True) # it deppends of this process tmp.add_dependency(self) diff --git a/src/devede/converter.py b/src/devede/converter.py index 5b930bd..c609a75 100644 --- a/src/devede/converter.py +++ b/src/devede/converter.py @@ -16,9 +16,9 @@ # along with this program. If not, see import devede.configuration_data -import devede.mplayer_detector -import devede.avconv_converter -import devede.ffmpeg_converter +import devede.mplayer +import devede.avconv +import devede.ffmpeg import devede.vlc import devede.brasero import devede.k3b @@ -40,8 +40,8 @@ class converter: self.config = devede.configuration_data.configuration.get_config() # List of classes with conversion capabilities, in order of preference - self.c = [devede.vlc.vlc_player, devede.mplayer_detector.mplayer_detector, devede.ffmpeg_converter.ffmpeg_converter, devede.avconv_converter.avconv_converter, - devede.brasero.brasero, devede.k3b.k3b, devede.mkisofs.mkisofs, devede.genisoimage.genisoimage] + self.c = [devede.vlc.vlc, devede.ffmpeg.ffmpeg, devede.avconv.avconv, + devede.brasero.brasero, devede.k3b.k3b, devede.mkisofs.mkisofs, devede.genisoimage.genisoimage, devede.mplayer.mplayer] self.analizers = {} self.default_analizer = None diff --git a/src/devede/ffmpeg_converter.py b/src/devede/ffmpeg.py similarity index 99% rename from src/devede/ffmpeg_converter.py rename to src/devede/ffmpeg.py index 24cc871..f8e897d 100644 --- a/src/devede/ffmpeg_converter.py +++ b/src/devede/ffmpeg.py @@ -24,7 +24,7 @@ import devede.executor import devede.mux_dvd_menu import devede.ffmpeg_converter -class ffmpeg_converter(devede.executor.executor): +class ffmpeg(devede.executor.executor): supports_analize = False supports_play = False @@ -113,7 +113,7 @@ class ffmpeg_converter(devede.executor.executor): else: self.text = _("Converting %(X)s (pass 1)") % {"X" : file_project.title_name} # Prepare the converting process for the second pass - tmp = devede.avconv_converter.avconv_converter() + tmp = devede.ffmpeg.ffmpeg() tmp.convert_file(file_project, output_file, video_length, True) # it deppends of this process tmp.add_dependency(self) diff --git a/src/devede/mplayer_detector.py b/src/devede/mplayer.py similarity index 99% rename from src/devede/mplayer_detector.py rename to src/devede/mplayer.py index 997ffb3..d0e8ff3 100644 --- a/src/devede/mplayer_detector.py +++ b/src/devede/mplayer.py @@ -22,7 +22,7 @@ import devede.configuration_data import devede.executor import os -class mplayer_detector(devede.executor.executor): +class mplayer(devede.executor.executor): supports_analize = True supports_play = True diff --git a/src/devede/vlc.py b/src/devede/vlc.py index 56a94f2..6a69b0e 100644 --- a/src/devede/vlc.py +++ b/src/devede/vlc.py @@ -19,7 +19,7 @@ import subprocess import devede.configuration_data import devede.executor -class vlc_player(devede.executor.executor): +class vlc(devede.executor.executor): supports_analize = False supports_play = True