luna/devedeng-extended
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added AC3 support for menus

Browse source 
Updated spanish translation

Added POTFILES.in file
This commit is contained in:
Sergio Costas 2014-08-13 21:09:52 +02:00
parent c914b5e66c
commit e42829e887
8 changed files with 1659 additions and 1267 deletions
Download patch file Download diff file Expand all files Collapse all files

41
README.md
View file

@ -16,7 +16,7 @@ Just type:
## USING DEVEDE NG ## ## USING DEVEDE NG ##
The first alpha version of Devede NG is very similar to the old devede, with the The second alpha version of Devede NG is very similar to the old devede, with the
exception that, when creating a DVD disc, there are no more "titles" and exception that, when creating a DVD disc, there are no more "titles" and
"files". Instead, you just add files to the disc. It also lacks support for Mencoder, "files". Instead, you just add files to the disc. It also lacks support for Mencoder,
and can use only FFMpeg or AVConv for video conversion. and can use only FFMpeg or AVConv for video conversion.
@ -31,7 +31,9 @@ The current visible changes are quite small in number:
* Allows to use VLC or MPlayer for preview * Allows to use VLC or MPlayer for preview
* Allows to choose between Brasero or K3B for burning the discs * Allows to choose between Brasero or K3B for burning the discs
* Allows to set properties for several files in one step * Allows to set properties for several files in one step
* Allow to choose the subtitle colors * Allows to choose the subtitle colors
* Allows to choose between MP2 and AC3 audio for menus
## THINGS TO DO ## ## THINGS TO DO ##
@ -41,24 +43,31 @@ Some of the future ideas to add to Devede NG are, without an specific order:
* add more output formats * add more output formats
* allow to replace the movie's audio track with one or several MP3 or OGG audio files * allow to replace the movie's audio track with one or several MP3 or OGG audio files
* widescreen menus for DVDs * widescreen menus for DVDs
* choose between MP2 and AC3 audio for menus
* preview of a converted menu * preview of a converted menu
## History of versions ## ## History of versions ##
* version in GIT
* Now shows a default value for preview duration * version 0.1 alpha 2 (2014-08-13)
* Fixed progress bar for subtitle creation * Updated spanish translation and added POTFILES.in file
* Allows to choose the subtitle colors * Allows to choose between MP2 and AC3 audio for menus
* Allows to set properties for several files in one step * Now only deletes the bare minimum files and folders to be able to create a disk in the specified final folder
* Fixed bug whe setting PAL or NTSC toggle in file properties * Better message text to specify which folder will be deleted when the final folder already exists
* Added two-pass conversion * It failed when the selected backend was not installed in the system. Fixed.
* Now detects separately MKISOFS and GENISOIMAGE, allowing to have only one of them installed in the system * Now shows a default value for preview duration
* Now checks that the number of files is smaller than the limit for DVD projects * Fixed progress bar for subtitle creation
* Now uses GLib for DBus instead of python-dbus * Allows to choose the subtitle colors
* Fixed the DESKTOP file to ensure that an icon is shown in the applications menu * Allows to set properties for several files in one step
* Fixed bug whe setting PAL or NTSC toggle in file properties
* Added two-pass conversion
* Now detects separately MKISOFS and GENISOIMAGE, allowing to have only one of them installed in the system
* Now checks that the number of files is smaller than the limit for DVD projects
* Now uses GLib for DBus instead of python-dbus
* Fixed the DESKTOP file to ensure that an icon is shown in the applications menu
* version 0.1 alpha 1 (2014-08-06) * version 0.1 alpha 1 (2014-08-06)
* First public version * First public version
## CONTACTING THE AUTHOR ## ## CONTACTING THE AUTHOR ##
@ -69,4 +78,4 @@ raster@rastersoft.com
http://www.rastersoft.com http://www.rastersoft.com
GIT: git://github.com/rastersoft/devedeng.git GIT: git://github.com/rastersoft/devedeng.git

139
data/interface/wmenu.ui
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 --> <!-- Generated with glade 3.18.3 -->
<interface> <interface>
<requires lib="gtk+" version="3.10"/> <requires lib="gtk+" version="3.10"/>
<object class="GtkAdjustment" id="margin_bottom"> <object class="GtkAdjustment" id="margin_bottom">
@ -81,8 +81,6 @@
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">0</property> <property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -95,8 +93,6 @@
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">1</property> <property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -109,8 +105,6 @@
<packing> <packing>
<property name="left_attach">2</property> <property name="left_attach">2</property>
<property name="top_attach">0</property> <property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -123,8 +117,6 @@
<packing> <packing>
<property name="left_attach">2</property> <property name="left_attach">2</property>
<property name="top_attach">1</property> <property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -135,8 +127,6 @@
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="top_attach">0</property> <property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -150,8 +140,6 @@
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="top_attach">1</property> <property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -164,8 +152,6 @@
<packing> <packing>
<property name="left_attach">3</property> <property name="left_attach">3</property>
<property name="top_attach">0</property> <property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -178,8 +164,6 @@
<packing> <packing>
<property name="left_attach">3</property> <property name="left_attach">3</property>
<property name="top_attach">1</property> <property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -193,7 +177,6 @@
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">3</property> <property name="top_attach">3</property>
<property name="width">2</property> <property name="width">2</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -207,7 +190,6 @@
<property name="left_attach">2</property> <property name="left_attach">2</property>
<property name="top_attach">3</property> <property name="top_attach">3</property>
<property name="width">2</property> <property name="width">2</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -221,7 +203,6 @@
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">2</property> <property name="top_attach">2</property>
<property name="width">2</property> <property name="width">2</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -235,7 +216,6 @@
<property name="left_attach">2</property> <property name="left_attach">2</property>
<property name="top_attach">2</property> <property name="top_attach">2</property>
<property name="width">2</property> <property name="width">2</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
</object> </object>
@ -328,27 +308,97 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="left_padding">12</property> <property name="left_padding">12</property>
<child> <child>
<object class="GtkBox" id="box6"> <object class="GtkBox" id="box4">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child> <child>
<object class="GtkFileChooserButton" id="background_music"> <object class="GtkBox" id="box6">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<child>
<object class="GtkFileChooserButton" id="background_music">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="no_sound">
<property name="label" translatable="yes">Menu without sound</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="clicked" handler="on_no_sound_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkButton" id="no_sound"> <object class="GtkBox" id="box11">
<property name="label" translatable="yes">Menu without sound</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">False</property>
<property name="receives_default">True</property> <child>
<signal name="clicked" handler="on_no_sound_clicked" swapped="no"/> <object class="GtkLabel" id="label13">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="margin_right">4</property>
<property name="label" translatable="yes">Audio format:</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="audio_mp2">
<property name="label" translatable="yes">MP2</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="audio_ac3">
<property name="label" translatable="yes">AC3</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">audio_mp2</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -401,8 +451,6 @@
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">0</property> <property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -416,7 +464,6 @@
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="top_attach">0</property> <property name="top_attach">0</property>
<property name="width">2</property> <property name="width">2</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -432,8 +479,6 @@
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">1</property> <property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -450,8 +495,6 @@
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">2</property> <property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -468,8 +511,6 @@
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">3</property> <property name="top_attach">3</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -484,7 +525,6 @@
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="top_attach">1</property> <property name="top_attach">1</property>
<property name="width">2</property> <property name="width">2</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -498,8 +538,6 @@
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="top_attach">2</property> <property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -513,8 +551,6 @@
<packing> <packing>
<property name="left_attach">2</property> <property name="left_attach">2</property>
<property name="top_attach">2</property> <property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -529,7 +565,6 @@
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="top_attach">3</property> <property name="top_attach">3</property>
<property name="width">2</property> <property name="width">2</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
</object> </object>
@ -619,8 +654,6 @@
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">0</property> <property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -633,8 +666,6 @@
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">1</property> <property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -647,8 +678,6 @@
<packing> <packing>
<property name="left_attach">2</property> <property name="left_attach">2</property>
<property name="top_attach">0</property> <property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -661,8 +690,6 @@
<packing> <packing>
<property name="left_attach">2</property> <property name="left_attach">2</property>
<property name="top_attach">1</property> <property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -674,8 +701,6 @@
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="top_attach">0</property> <property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -688,8 +713,6 @@
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="top_attach">1</property> <property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -701,8 +724,6 @@
<packing> <packing>
<property name="left_attach">3</property> <property name="left_attach">3</property>
<property name="top_attach">0</property> <property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -715,8 +736,6 @@
<packing> <packing>
<property name="left_attach">3</property> <property name="left_attach">3</property>
<property name="top_attach">1</property> <property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
</object> </object>

57
po/POTFILES.in Normal file
View file

@ -0,0 +1,57 @@
src/copy_files_verbose.py
src/devede_ng.py
src/devede/about.py
src/devede/add_files.py
src/devede/ask.py
src/devede/ask_subtitles.py
src/devede/avconv_converter.py
src/devede/brasero.py
src/devede/choose_disc_type.py
src/devede/configuration_data.py
src/devede/converter.py
src/devede/create_disk_window.py
src/devede/dvdauthor_converter.py
src/devede/dvd_menu.py
src/devede/end_job.py
src/devede/error.py
src/devede/executor.py
src/devede/ffmpeg_converter.py
src/devede/file_copy.py
src/devede/file_movie.py
src/devede/genisoimage.py
src/devede/__init__.py
src/devede/interface_manager.py
src/devede/k3b.py
src/devede/message.py
src/devede/mkisofs.py
src/devede/mplayer_detector.py
src/devede/mux_dvd_menu.py
src/devede/opensave.py
src/devede/preview.py
src/devede/project.py
src/devede/runner.py
src/devede/settings.py
src/devede/shutdown.py
src/devede/subtitles_mux.py
src/devede/title.py
src/devede/vcdimager_converter.py
src/devede/vlc.py
[type: gettext/glade]data/interface/wabout.ui
[type: gettext/glade]data/interface/wadd_files.ui
[type: gettext/glade]data/interface/wask_subtitles.ui
[type: gettext/glade]data/interface/wask.ui
[type: gettext/glade]data/interface/wcreate.ui
[type: gettext/glade]data/interface/wdone.ui
[type: gettext/glade]data/interface/werror.ui
[type: gettext/glade]data/interface/wfile_properties.ui
[type: gettext/glade]data/interface/wmain.ui
[type: gettext/glade]data/interface/wmenu.ui
[type: gettext/glade]data/interface/wmessage.ui
[type: gettext/glade]data/interface/wneeded.ui
[type: gettext/glade]data/interface/wopen_project.ui
[type: gettext/glade]data/interface/wpreview.ui
[type: gettext/glade]data/interface/wprogress.ui
[type: gettext/glade]data/interface/wsave_project.ui
[type: gettext/glade]data/interface/wselect_disk.ui
[type: gettext/glade]data/interface/wsettings.ui
[type: gettext/glade]data/interface/wtitle_properties.ui

2669
po/es.po
View file

File diff suppressed because it is too large Load diff

7
src/devede/avconv_converter.py
View file

@ -349,7 +349,7 @@ class avconv_converter(devede.executor.executor):
self.command_var.append(output_file) self.command_var.append(output_file)
def create_menu_mpeg(self,n_page,background_music,sound_length,pal,video_rate, audio_rate,output_path): def create_menu_mpeg(self,n_page,background_music,sound_length,pal,video_rate, audio_rate,output_path, use_mp2):
self.n_page = n_page self.n_page = n_page
self.final_length = float(sound_length) self.final_length = float(sound_length)
@ -375,7 +375,10 @@ class avconv_converter(devede.executor.executor):
else: else:
self.command_var.append("ntsc-dvd") self.command_var.append("ntsc-dvd")
self.command_var.append("-acodec") self.command_var.append("-acodec")
self.command_var.append("mp2") if (use_mp2):
self.command_var.append("mp2")
else:
self.command_var.append("ac3")
self.command_var.append("-s") self.command_var.append("-s")
if pal: if pal:
self.command_var.append("720x576") self.command_var.append("720x576")

2
src/devede/configuration_data.py
View file

@ -35,7 +35,7 @@ class configuration(GObject.GObject):
def __init__(self): def __init__(self):
GObject.GObject.__init__(self) GObject.GObject.__init__(self)
self.version = "0.1 Alpha 1" self.version = "0.1 Alpha 2"
def fill_config(self): def fill_config(self):

4
src/devede/dvd_menu.py
View file

@ -50,6 +50,8 @@ class dvd_menu(devede.interface_manager.interface_manager):
self.add_integer_adjustment("sound_length", 30) self.add_integer_adjustment("sound_length", 30)
self.add_dualtoggle("audio_mp2", "audio_ac3", True)
self.add_float_adjustment("margin_left", 10.0, self.update_preview) self.add_float_adjustment("margin_left", 10.0, self.update_preview)
self.add_float_adjustment("margin_top", 12.5, self.update_preview) self.add_float_adjustment("margin_top", 12.5, self.update_preview)
self.add_float_adjustment("margin_right", 10.0, self.update_preview) self.add_float_adjustment("margin_right", 10.0, self.update_preview)
@ -601,7 +603,7 @@ class dvd_menu(devede.interface_manager.interface_manager):
self.sf.write_to_png(os.path.join(menu_folder,"menu_"+str(n_page)+"_active_bg.png")) self.sf.write_to_png(os.path.join(menu_folder,"menu_"+str(n_page)+"_active_bg.png"))
entry_data = self.create_menu_stream(menu_folder, n_page, coordinates) entry_data = self.create_menu_stream(menu_folder, n_page, coordinates)
converter = menu_converter() converter = menu_converter()
final_path = converter.create_menu_mpeg(n_page,self.background_music,self.sound_length,self.config.PAL,self.video_rate,self.audio_rate,menu_folder) final_path = converter.create_menu_mpeg(n_page,self.background_music,self.sound_length,self.config.PAL,self.video_rate,self.audio_rate,menu_folder, self.audio_mp2)
entry_data["filename"] = final_path entry_data["filename"] = final_path
menu_entries.append(entry_data) menu_entries.append(entry_data)
# add this process without dependencies # add this process without dependencies

7
src/devede/ffmpeg_converter.py
View file

@ -349,7 +349,7 @@ class ffmpeg_converter(devede.executor.executor):
self.command_var.append(output_file) self.command_var.append(output_file)
def create_menu_mpeg(self,n_page,background_music,sound_length,pal,video_rate, audio_rate,output_path): def create_menu_mpeg(self,n_page,background_music,sound_length,pal,video_rate, audio_rate,output_path, use_mp2):
self.n_page = n_page self.n_page = n_page
self.final_length = float(sound_length) self.final_length = float(sound_length)
@ -375,7 +375,10 @@ class ffmpeg_converter(devede.executor.executor):
else: else:
self.command_var.append("ntsc-dvd") self.command_var.append("ntsc-dvd")
self.command_var.append("-acodec") self.command_var.append("-acodec")
self.command_var.append("mp2") if use_mp2:
self.command_var.append("mp2")
else:
self.command_var.append("ac3")
self.command_var.append("-s") self.command_var.append("-s")
if pal: if pal:
self.command_var.append("720x576") self.command_var.append("720x576")