Revert "servicedvd.cpp: fix merge error (caused by the vob subtitle bug merge)"

[enigma2.git] / lib / python / Plugins / Extensions / DVDBurn / plugin.py

diff --git a/lib/python/Plugins/Extensions/DVDBurn/plugin.py b/lib/python/Plugins/Extensions/DVDBurn/plugin.py
index 8e0d74333caf3d4d4c6871e8f4599d40a7068555..f5d2fa6262c32d64c3aecbe8d2b04649ec02d98a 100644 (file)
--- a/lib/python/Plugins/Extensions/DVDBurn/plugin.py
+++ b/lib/python/Plugins/Extensions/DVDBurn/plugin.py
@@ -1,13 +1,17 @@
 from Plugins.Plugin import PluginDescriptor
 
-def main(session, service, **kwargs):
+def main(session, **kwargs):
        import TitleList
        import DVDProject
        #project = DVDProject.DVDProject()
        #project.addService(service)
-       burner = session.open(TitleList.TitleList)
-       burner.selectedSource(service)
+       return session.open(TitleList.TitleList)
        
+def main_add(session, service, **kwargs):
+       dvdburn = main(session, **kwargs)
+       dvdburn.selectedSource(service)
 
 def Plugins(**kwargs):
-       return PluginDescriptor(name="DVD Tool", description=_("Burn to DVD..."), where = PluginDescriptor.WHERE_MOVIELIST, fnc=main)
+       descr = _("Burn to DVD")
+       return [PluginDescriptor(name="DVD Burn", description=descr, where = PluginDescriptor.WHERE_MOVIELIST, needsRestart = True, fnc=main_add, icon="dvdburn.png"),
+               PluginDescriptor(name="DVD Burn", description=descr, where = PluginDescriptor.WHERE_PLUGINMENU, needsRestart = True, fnc=main, icon="dvdburn.png") ]