Moved Plugin to new location in AudioMenu via WHERE_AUDIOMENU. Removed from Extension...

diff --git a/ac3lipsync/CONTROL/control b/ac3lipsync/CONTROL/control
index bd9cd36..29beb54 100644 (file)
--- a/ac3lipsync/CONTROL/control
+++ b/ac3lipsync/CONTROL/control
@@ -1,12 +1,12 @@
 Package: enigma2-plugin-extensions-audiosync
 Replaces: enigma2-plugin-extensions-ac3lipsync
 Conflicts: enigma2-plugin-extensions-ac3lipsync
-Version: 1.1-20091218-r0
+Version: 1.2-20100225-r0
 Description: Set Audio delay
 Architecture: mipsel
 Section: extra
 Priority: optional
 Maintainer: Tode <sagichnet@gmx.net>
 Homepage: n/a
-Depends: 
+Depends: enigma2(>=2.6git20091203)
 Source: http://enigma2-plugins.schwerkraft.elitedvb.net/

diff --git a/ac3lipsync/src/AC3main.py b/ac3lipsync/src/AC3main.py
index 35d9add..7a42160 100644 (file)
--- a/ac3lipsync/src/AC3main.py
+++ b/ac3lipsync/src/AC3main.py
@@ -11,10 +11,9 @@ from Screens.ChoiceBox import ChoiceBox
 from Screens.HelpMenu import HelpableScreen
 from Screens.MessageBox import MessageBox
 from Screens.Screen import Screen
-from Screens.InfoBarGenerics import InfoBarAudioSelection
 from __init__ import _
 
-class AC3LipSync(Screen, HelpableScreen, MovableScreen, InfoBarAudioSelection):
+class AC3LipSync(Screen, HelpableScreen, MovableScreen):
 
     def __init__(self, session, plugin_path):
         Screen.__init__(self, session)
@@ -22,9 +21,6 @@ class AC3LipSync(Screen, HelpableScreen, MovableScreen, InfoBarAudioSelection):
         self.skin = SKIN
         self.skin_path = plugin_path
 
-        #Initialisiere Infobargenerics
-        InfoBarAudioSelection.__init__(self)
-
         # Configuration values
         self.upperBound = int(config.plugins.AC3LipSync.outerBounds.getValue())
         self.lowerBound = -1 * self.upperBound
@@ -69,7 +65,6 @@ class AC3LipSync(Screen, HelpableScreen, MovableScreen, InfoBarAudioSelection):
         # Buttons
         self["key_red"] = Label(_("Cancel"))
         self["key_green"] = Label(_("OK"))
-        self["key_yellow"] = Label(_("Switch audio"))
         self["key_blue"] = Label(_("Save to key"))
 
         # Actions
@@ -84,7 +79,6 @@ class AC3LipSync(Screen, HelpableScreen, MovableScreen, InfoBarAudioSelection):
             "down":     (self.keyDown,              _("Decrease delay")),
             "red":      (self.keyCancel,            _("Discard changes and close plugin")),
             "green":    (self.keyOk,                _("Save values and close plugin")),
-            "yellow":   (self.keyAudioSelection,    _("Select channel audio")),
             "blue":     (self.menuSaveDelayToKey,    _("Save current delay to key")),
             "1":        (self.keyNumberRelative,    _("Decrease delay by %i ms (can be set)")%self.stepSize["1"]),
             "3":        (self.keyNumberRelative,    _("Increase delay by %i ms (can be set)")%self.stepSize["3"]),
@@ -190,9 +184,6 @@ class AC3LipSync(Screen, HelpableScreen, MovableScreen, InfoBarAudioSelection):
         self.setSliderInfo(iSliderValue)
         self.AC3delay.setSystemDelay(sAudio, self.currentValue[sAudio], True)        
 
-    def keyAudioSelection(self):
-        self.audioSelection()
-
     def keyOk(self):
         self.close()
 
@@ -241,13 +232,6 @@ class AC3LipSync(Screen, HelpableScreen, MovableScreen, InfoBarAudioSelection):
         sPCMDelay = _("%i ms") %self.AC3delay.systemDelay[PCM]
 
         self["ServiceInfo"].setText(sActiveAudio)
-
-    def audioSelected(self, audio):
-        InfoBarAudioSelection.audioSelected(self, audio)
-        if audio is not None:
-            self.AC3delay.getAudioInformation()
-            self.setChannelInfoText()
-            self.setActiveSlider()
             
 class AC3SetCustomValue:
     def __init__(self, session, iDelay, keyStep):

diff --git a/ac3lipsync/src/AC3utils.py b/ac3lipsync/src/AC3utils.py
index ad3f69a..7c05aa8 100644 (file)
--- a/ac3lipsync/src/AC3utils.py
+++ b/ac3lipsync/src/AC3utils.py
@@ -5,7 +5,7 @@ PCMGLOB = "PCMGLOB"
 AC3PCM = (AC3,PCM,AC3GLOB,PCMGLOB)
 
 PLUGIN_BASE = "AudioSync"
-PLUGIN_VERSION = "1.1"
+PLUGIN_VERSION = "1.2"
 
 MOVEPOSITIONSTEP = 10
        
@@ -23,14 +23,11 @@ SKIN = """
             <widget name="ServiceInfo" zPosition="4" position="90,15" size="200,20" font="Regular;14" backgroundColor="#232323" foregroundColor="#ffffff" transparent="1" />
             <ePixmap pixmap="~/img/key-green.png" position="290,15" zPosition="5" size="20,20" transparent="1" alphatest="on" />
             <ePixmap pixmap="~/img/key-red.png" position="290,40" zPosition="5" size="20,20" transparent="1" alphatest="on" />
-            <ePixmap pixmap="~/img/key-yellow.png" position="400,15" zPosition="5" size="20,20" transparent="1" alphatest="on" />
-            <ePixmap pixmap="~/img/key-blue.png" position="400,40" zPosition="5" size="20,20" transparent="1" alphatest="on" />
+            <ePixmap pixmap="~/img/key-blue.png" position="400,15" zPosition="5" size="20,20" transparent="1" alphatest="on" />
             <widget name="key_green" position="315,15" zPosition="4" size="85,20"
                 font="Regular;14" valign="center" halign="left" backgroundColor="#232323" foregroundColor="#ffffff" transparent="1"/>
             <widget name="key_red" position="315,40" zPosition="4" size="85,20"
                 font="Regular;14" valign="center" halign="left" backgroundColor="#232323" foregroundColor="#ffffff" transparent="1"/>
-            <widget name="key_yellow" position="425,15" zPosition="4" size="160,20"
-                font="Regular;14" valign="center" halign="left" backgroundColor="#232323" foregroundColor="#ffffff" transparent="1" />
-            <widget name="key_blue" position="425,40" zPosition="4" size="160,20"
+            <widget name="key_blue" position="425,15" zPosition="4" size="160,20"
                 font="Regular;14" valign="center" halign="left" backgroundColor="#232323" foregroundColor="#ffffff" transparent="1" />
         </screen>"""        
\ No newline at end of file

diff --git a/ac3lipsync/src/plugin.py b/ac3lipsync/src/plugin.py
index de6f899..616b4dc 100644 (file)
--- a/ac3lipsync/src/plugin.py
+++ b/ac3lipsync/src/plugin.py
@@ -25,15 +25,12 @@ def setup(session, **kwargs):
 #    reload(AC3setup)
     session.open(AC3setup.AC3LipSyncSetup, plugin_path)
 
-def mainSetup(menuid, **kwargs):
-    if menuid == "setup":
-        return [(_("Audio Sync"), main, "ac3_lipsync", 99)]
-    return [ ]
+def audioMenu(session, **kwargs):
+#    reload(AC3setup)
+    session.open(AC3main.AC3LipSync, plugin_path)
 
 def Plugins(path,**kwargs):
     global plugin_path
     plugin_path = path
-    return [ PluginDescriptor(name=_("Audio Sync"), description=_("sets the Audio Delay (LipSync)"), where = PluginDescriptor.WHERE_EXTENSIONSMENU, fnc=main),
-        PluginDescriptor(name=_("Audio Sync Setup"), description=_("Setup for the Audio Sync Plugin"), icon = "AudioSync.png", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=setup),
-        PluginDescriptor(name=_("Audio Sync"), description=_("sets the Audio Delay (LipSync)"), where = PluginDescriptor.WHERE_MENU, fnc=mainSetup)]
-
+    return [ PluginDescriptor(name=_("Audio Sync Setup"), description=_("Setup for the Audio Sync Plugin"), icon = "AudioSync.png", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=setup),
+        PluginDescriptor(name=_("Audio Sync"), description=_("sets the Audio Delay (LipSync)"), where = PluginDescriptor.WHERE_AUDIOMENU, fnc=audioMenu)]