From 70c8a709b295e246474276b4bbbeeea207d98bbd Mon Sep 17 00:00:00 2001 From: glenntanner3 Date: Thu, 30 Apr 2015 13:57:55 -0400 Subject: [PATCH] First working version of 'Play All' option.Set 'Play All' menu option to off by default.TODO: Test --- src/devedeng/dvd_menu.py | 2 +- src/devedeng/dvdauthor_converter.py | 32 ++++++++++++++++++++++------- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/src/devedeng/dvd_menu.py b/src/devedeng/dvd_menu.py index 463edaa..5e83d2d 100644 --- a/src/devedeng/dvd_menu.py +++ b/src/devedeng/dvd_menu.py @@ -47,7 +47,7 @@ class dvd_menu(devedeng.interface_manager.interface_manager): self.add_group("position_horizontal", ["left", "center", "right"], "center", self.update_preview) self.add_group("at_startup", ["menu_show_at_startup", "play_first_title_at_startup"], "menu_show_at_startup") - self.add_group("play_all", ["menu_play_all", "menu_no_play_all"], "menu_play_all", self.update_preview) + self.add_group("play_all", ["menu_play_all", "menu_no_play_all"], "menu_no_play_all", self.update_preview) self.add_integer_adjustment("sound_length", 30) diff --git a/src/devedeng/dvdauthor_converter.py b/src/devedeng/dvdauthor_converter.py index 603c3f9..620443d 100644 --- a/src/devedeng/dvdauthor_converter.py +++ b/src/devedeng/dvdauthor_converter.py @@ -94,11 +94,13 @@ class dvdauthor_converter(devedeng.executor.executor): xml_file.write('\t\t\n') xml_file.write('\t\t\tg0=100;\n') + xml_file.write('\t\t\tg1=') #start with menu variable, although since this would be static is it needed? if (menu_entries != None) and (start_with_menu): - xml_file.write('\t\t\tg1=0;\n') + xml_file.write('0;\n') #show menu else: - xml_file.write('\t\t\tg1=100;\n') - xml_file.write('\t\t\tg2=1024;\n') + xml_file.write('100;\n') #auto play + xml_file.write('\t\t\tg2=1024;\n') #highlight? + xml_file.write('\t\t\tg3=0;\n') #play all variable xml_file.write('\t\t\tjump menu 1;\n') xml_file.write('\t\t\n') @@ -173,8 +175,8 @@ class dvdauthor_converter(devedeng.executor.executor): for menu_page in menu_entries: xml_file.write('\t\t\t\n') xml_file.write('\t\t\t\t
\n')
-                    # first we recover the currently selected button
-                    xml_file.write('\t\t\t\t\ts8=g2;\n')
+                    xml_file.write('\t\t\t\t\ts8=g2;\n') # first we recover the currently selected button
+                    xml_file.write('\t\t\t\t\tg3=0;\n') #turnoff play all
 
                     if first_entry: # here we add some code to jump to each menu
                         for menu2 in range(nmenues-1):
@@ -195,8 +197,15 @@ class dvdauthor_converter(devedeng.executor.executor):
                     xml_file.write('">\n')
 
                     for nbutton in menu_page["chapters"]:
-                        xml_file.write('\t\t\t\t\n')
-                        button_counter+=1
+                        #xml_file.write('\t\t\t\t\n')
+                        xml_file.write('\t\t\t\t\n')
+                        if not play_all_opt:
+                            button_counter+=1
 
                     if (menu_page["left"] != None):
                         xml_file.write('\t\t\t\t