diff options
Diffstat (limited to 'lib/python/Plugins/Extensions')
24 files changed, 142 insertions, 156 deletions
diff --git a/lib/python/Plugins/Extensions/CutListEditor/meta/plugin_cutlisteditor.xml b/lib/python/Plugins/Extensions/CutListEditor/meta/plugin_cutlisteditor.xml index 1431caf4..7132ba02 100755 --- a/lib/python/Plugins/Extensions/CutListEditor/meta/plugin_cutlisteditor.xml +++ b/lib/python/Plugins/Extensions/CutListEditor/meta/plugin_cutlisteditor.xml @@ -2,23 +2,14 @@ <prerequisites> <tag type="Recording" /> </prerequisites> - <info language="en"> + <info> <author>Dream Multimedia</author> <name>CutListEditor</name> <packagename>enigma2-plugin-extensions-cutlisteditor</packagename> - <shortdescription>CutListEditor allows you to edit your movies.</shortdescription> + <shortdescription>CutListEditor allows you to edit your movies</shortdescription> <description>CutListEditor allows you to edit your movies.\nSeek to the start of the stuff you want to cut away. Press OK, select 'start cut'.\nThen seek to the end, press OK, select 'end cut'. That's it.</description> <screenshot src="http://www.dreamboxupdate.com/preview/plugin_cutlisteditor.jpg" /> </info> - <info language="de"> - <author>Dream Multimedia</author> - <name>Schnitteditor</name> - <packagename>enigma2-plugin-extensions-cutlisteditor</packagename> - <shortdescription>Mit dem Schnitteditor können Sie Ihre Aufnahmen schneiden.</shortdescription> - <description>Mit dem Schnitteditor können Sie Ihre Aufnahmen schneiden.\nSpulen Sie zum Anfang des zu schneidenden Teils der Aufnahme. Drücken Sie dann OK und wählen Sie: 'start cut'.\nDann spulen Sie zum Ende, drücken OK und wählen 'end cut'. Das ist alles. - </description> - <screenshot src="http://www.dreamboxupdate.com/preview/plugin_cutlisteditor.jpg" /> - </info> <files type="package"> <!-- without version, without .ipk --> <file type="package" name="enigma2-plugin-extensions-cutlisteditor" /> </files> diff --git a/lib/python/Plugins/Extensions/DVDBurn/DVDProject.py b/lib/python/Plugins/Extensions/DVDBurn/DVDProject.py index 7f755db4..6dbcd499 100644 --- a/lib/python/Plugins/Extensions/DVDBurn/DVDProject.py +++ b/lib/python/Plugins/Extensions/DVDBurn/DVDProject.py @@ -2,6 +2,7 @@ from Tools.Directories import fileExists from Components.config import config, ConfigSubsection, ConfigInteger, ConfigText, ConfigSelection, getConfigListEntry, ConfigSequence, ConfigSubList import DVDTitle import xml.dom.minidom +from Tools.Directories import resolveFilename, SCOPE_PLUGINS, SCOPE_FONTS class ConfigColor(ConfigSequence): def __init__(self, default = [128,128,128]): @@ -125,6 +126,14 @@ class DVDProject: for key in self.filekeys: val = self.settings.dict()[key].getValue() if not fileExists(val): + if val[0] != "/": + if key.find("font") == 0: + val = resolveFilename(SCOPE_FONTS)+val + else: + val = resolveFilename(SCOPE_PLUGINS)+"Extensions/DVDBurn/"+val + if fileExists(val): + self.settings.dict()[key].setValue(val) + continue self.error += "\n%s '%s' not found" % (key, val) #except AttributeError: #print "loadProject AttributeError", self.error diff --git a/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py b/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py index 53287a36..0b81cfdf 100755 --- a/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py +++ b/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py @@ -68,7 +68,7 @@ class DVDToolbox(Screen): self["info"].text = "" self["details"].setText("") self.Console = Console() - cmd = "/bin/dvd+rw-mediainfo /dev/" + harddiskmanager.getCD() + cmd = "dvd+rw-mediainfo /dev/" + harddiskmanager.getCD() self.Console.ePopen(cmd, self.mediainfoCB) def format(self): @@ -186,7 +186,7 @@ class DVDformatTask(Task): Task.__init__(self, job, ("RW medium format")) self.toolbox = job.toolbox self.postconditions.append(DVDformatTaskPostcondition()) - self.setTool("/bin/dvd+rw-format") + self.setTool("dvd+rw-format") self.args += [ "/dev/" + harddiskmanager.getCD() ] self.end = 1100 self.retryargs = [ ] diff --git a/lib/python/Plugins/Extensions/DVDBurn/DreamboxDVD.ddvdp.xml b/lib/python/Plugins/Extensions/DVDBurn/DreamboxDVD.ddvdp.xml index 451e8a8b..4645260d 100644 --- a/lib/python/Plugins/Extensions/DVDBurn/DreamboxDVD.ddvdp.xml +++ b/lib/python/Plugins/Extensions/DVDBurn/DreamboxDVD.ddvdp.xml @@ -3,11 +3,11 @@ <settings name="Dreambox DVD record" authormode="menu_linked" - menutemplate="/usr/lib/enigma2/python/Plugins/Extensions/DVDBurn/Thumbs_menu_clouds.ddvdm.xml" + menutemplate="Thumbs_menu_clouds.ddvdm.xml" titlesetmode="multi" - vmgm="/usr/lib/enigma2/python/Plugins/Extensions/DVDBurn/vmgmdream.mpg" + vmgm="vmgmdream.mpg" output="dvd" - isopath="/media/hdd/movie/" + isopath="/hdd/movie/" dataformat="iso9660_4" /> <titles> </titles> diff --git a/lib/python/Plugins/Extensions/DVDBurn/Process.py b/lib/python/Plugins/Extensions/DVDBurn/Process.py index b64541b6..e00dedd9 100644 --- a/lib/python/Plugins/Extensions/DVDBurn/Process.py +++ b/lib/python/Plugins/Extensions/DVDBurn/Process.py @@ -95,6 +95,8 @@ class DemuxTask(Task): self.relevantAudioPIDs = [ ] self.getRelevantAudioPIDs(title) self.generated_files = [ ] + self.mplex_audiofiles = { } + self.mplex_videofile = "" self.mplex_streamfiles = [ ] if len(self.cutlist) > 1: self.args += [ "-cut", self.cutfile ] @@ -132,8 +134,10 @@ class DemuxTask(Task): def haveNewFile(self, file): print "[DemuxTask] produced file:", file, self.currentPID self.generated_files.append(file) - if self.currentPID in self.relevantAudioPIDs or file.endswith("m2v"): - self.mplex_streamfiles.append(file) + if self.currentPID in self.relevantAudioPIDs: + self.mplex_audiofiles[self.currentPID] = file + elif file.endswith("m2v"): + self.mplex_videofile = file def haveProgress(self, progress): #print "PROGRESS [%s]" % progress @@ -167,6 +171,12 @@ class DemuxTask(Task): f.close() def cleanup(self, failed): + print "[DemuxTask::cleanup]" + self.mplex_streamfiles = [ self.mplex_videofile ] + for pid in self.relevantAudioPIDs: + self.mplex_streamfiles.append(self.mplex_audiofiles[pid]) + print self.mplex_streamfiles + if failed: import os for file in self.generated_files: diff --git a/lib/python/Plugins/Extensions/DVDBurn/Text_menu_boat.ddvdm.xml b/lib/python/Plugins/Extensions/DVDBurn/Text_menu_boat.ddvdm.xml index 0de7f4b6..bf6356a9 100644 --- a/lib/python/Plugins/Extensions/DVDBurn/Text_menu_boat.ddvdm.xml +++ b/lib/python/Plugins/Extensions/DVDBurn/Text_menu_boat.ddvdm.xml @@ -3,17 +3,17 @@ <settings titleformat="$i. $t" subtitleformat="$D.$M.$Y, $T $C, $d" - menubg="/usr/lib/enigma2/python/Plugins/Extensions/DVDBurn/dreamdvd_boat.jpg" - menuaudio="/usr/lib/enigma2/python/Plugins/Extensions/DVDBurn/silence.mp2" + menubg="dreamdvd_boat.jpg" + menuaudio="silence.mp2" dimensions="(720, 576)" rows="5" cols="1" color_button="[8, 0, 0]" color_highlight="[0, 192, 192]" color_headline="[0, 0, 128]" - fontface_headline="/usr/share/fonts/nmsbd.ttf" - fontface_title="/usr/share/fonts/nmsbd.ttf" - fontface_subtitle="/usr/share/fonts/nmsbd.ttf" + fontface_headline="nmsbd.ttf" + fontface_title="nmsbd.ttf" + fontface_subtitle="nmsbd.ttf" fontsize_headline="46" fontsize_title="24" fontsize_subtitle="14" diff --git a/lib/python/Plugins/Extensions/DVDBurn/Thumbs_menu_clouds.ddvdm.xml b/lib/python/Plugins/Extensions/DVDBurn/Thumbs_menu_clouds.ddvdm.xml index c00c3fee..074f2037 100644 --- a/lib/python/Plugins/Extensions/DVDBurn/Thumbs_menu_clouds.ddvdm.xml +++ b/lib/python/Plugins/Extensions/DVDBurn/Thumbs_menu_clouds.ddvdm.xml @@ -3,17 +3,17 @@ <settings titleformat="$t" subtitleformat="$d" - menubg="/usr/lib/enigma2/python/Plugins/Extensions/DVDBurn/dreamdvd_clouds.jpg" - menuaudio="/usr/lib/enigma2/python/Plugins/Extensions/DVDBurn/silence.mp2" + menubg="dreamdvd_clouds.jpg" + menuaudio="silence.mp2" dimensions="(720, 576)" rows="2" cols="2" color_button="[8, 0, 0]" color_highlight="[128, 0, 0]" color_headline="[128, 0, 0]" - fontface_headline="/usr/share/fonts/nmsbd.ttf" - fontface_title="/usr/share/fonts/nmsbd.ttf" - fontface_subtitle="/usr/share/fonts/nmsbd.ttf" + fontface_headline="nmsbd.ttf" + fontface_title="nmsbd.ttf" + fontface_subtitle="nmsbd.ttf" fontsize_headline="46" fontsize_title="18" fontsize_subtitle="12" diff --git a/lib/python/Plugins/Extensions/DVDBurn/TitleCutter.py b/lib/python/Plugins/Extensions/DVDBurn/TitleCutter.py index a52fad9f..71a7f239 100644 --- a/lib/python/Plugins/Extensions/DVDBurn/TitleCutter.py +++ b/lib/python/Plugins/Extensions/DVDBurn/TitleCutter.py @@ -32,9 +32,9 @@ class TitleCutter(CutListEditor): pid = str(i.getPID()) if description == "MPEG": description = "MP2" - print "[audiotrack] pid:", pid, "description:", description, "language:", DVB_lang + print "[audiotrack] pid:", pid, "description:", description, "language:", DVB_lang, "count:", x, "active:", (x < 8) self.t.properties.audiotracks.append(ConfigSubsection()) - self.t.properties.audiotracks[-1].active = ConfigYesNo(default = True) + self.t.properties.audiotracks[-1].active = ConfigYesNo(default = (x < 8)) self.t.properties.audiotracks[-1].format = ConfigFixedText(description) self.t.properties.audiotracks[-1].language = ConfigSelection(choices = languageChoices.choices, default=languageChoices.getLanguage(DVB_lang)) self.t.properties.audiotracks[-1].pid = ConfigFixedText(pid) diff --git a/lib/python/Plugins/Extensions/DVDBurn/meta/plugin_dvdburn.xml b/lib/python/Plugins/Extensions/DVDBurn/meta/plugin_dvdburn.xml index 647d1cfd..c1e202a9 100755 --- a/lib/python/Plugins/Extensions/DVDBurn/meta/plugin_dvdburn.xml +++ b/lib/python/Plugins/Extensions/DVDBurn/meta/plugin_dvdburn.xml @@ -3,22 +3,17 @@ <tag type="Recording" /> <tag type="Software" /> </prerequisites> - <info language="en"> + <info> <author>Dream Multimedia</author> <name>DVDBurn</name> <packagename>enigma2-plugin-extensions-dvdburn</packagename> - <shortdescription>With DVDBurn you can burn your recordings to a dvd.</shortdescription> - <description>With DVDBurn you can burn your recordings to a dvd.\nArchive all your favorite movies to recordable dvds with menus if wanted.</description> + <shortdescription>Burn your recordings to DVD</shortdescription> + <description>With DVDBurn you can make compilations of records from your Dreambox hard drive.\n + Optionally you can add customizable menus. You can record the compilation to a standard-compliant DVD that can be played on conventinal DVD players.\n + HDTV recordings can only be burned in proprietary dreambox format.</description> <screenshot src="http://www.dreamboxupdate.com/preview/plugin_dvdburn_en.jpg" /> </info> - <info language="de"> - <author>Dream Multimedia</author> - <name>DVDBurn</name> - <packagename>enigma2-plugin-extensions-dvdburn</packagename> - <shortdescription>Mit DVDBurn brennen Sie ihre Aufnahmen auf DVD.</shortdescription> - <description>Mit DVDBurn brennen Sie ihre Aufnahmen auf DVD.\nArchivieren Sie Ihre Liblingsfilme auf DVD mit Menus wenn Sie es wünschen.</description> - <screenshot src="http://www.dreamboxupdate.com/preview/plugin_dvdburn_de.jpg" /> - </info> + <files type="package"> <!-- without version, without .ipk --> <file type="package" name="enigma2-plugin-extensions-dvdburn" /> </files> diff --git a/lib/python/Plugins/Extensions/DVDPlayer/Makefile.am b/lib/python/Plugins/Extensions/DVDPlayer/Makefile.am index 71ea7142..ec212e47 100644 --- a/lib/python/Plugins/Extensions/DVDPlayer/Makefile.am +++ b/lib/python/Plugins/Extensions/DVDPlayer/Makefile.am @@ -1,4 +1,3 @@ -if HAVE_DDVDLIB SUBDIRS = src meta installdir = $(pkglibdir)/python/Plugins/Extensions/DVDPlayer @@ -8,4 +7,3 @@ install_PYTHON = \ plugin.py \ keymap.xml \ LICENSE -endif diff --git a/lib/python/Plugins/Extensions/DVDPlayer/meta/plugin_dvdplayer.xml b/lib/python/Plugins/Extensions/DVDPlayer/meta/plugin_dvdplayer.xml index 1353f7d2..6fc5a6f1 100755 --- a/lib/python/Plugins/Extensions/DVDPlayer/meta/plugin_dvdplayer.xml +++ b/lib/python/Plugins/Extensions/DVDPlayer/meta/plugin_dvdplayer.xml @@ -2,23 +2,14 @@ <prerequisites> <tag type="Multimedia" /> </prerequisites> - <info language="en"> + <info> <author>Dream Multimedia</author> <name>DVDPlayer</name> <packagename>enigma2-plugin-extensions-dvdplayer</packagename> - <shortdescription>DVDPlayer plays your DVDs on your Dreambox.</shortdescription> + <shortdescription>DVDPlayer plays your DVDs on your Dreambox</shortdescription> <description>DVDPlayer plays your DVDs on your Dreambox.\nWith the DVDPlayer you can play your DVDs on your Dreambox from a DVD or even from an iso file or video_ts folder on your harddisc or network.</description> <screenshot src="http://www.dreamboxupdate.com/preview/plugin_dvdplayer.jpg" /> </info> - <info language="de"> - <author>Dream Multimedia</author> - <name>DVDPlayer</name> - <packagename>enigma2-plugin-extensions-dvdplayer</packagename> - <shortdescription>Spielen Sie Ihre DVDs mit dem DVDPlayer auf Ihrer Dreambox ab.</shortdescription> - <description>Spielen Sie Ihre DVDs mit dem DVDPlayer auf Ihrer Dreambox ab.\nMit dem DVDPlayer können Sie Ihre DVDs auf Ihrer Dreambox abspielen. Dabei ist es egal ob Sie von DVD, iso-Datei oder sogar direkt von einer video_ts Ordnerstruktur von Ihrer Festplatte oder dem Netzwerk abspielen. - </description> - <screenshot src="http://www.dreamboxupdate.com/preview/plugin_dvdplayer.jpg" /> - </info> <files type="package"> <!-- without version, without .ipk --> <file type="package" name="enigma2-plugin-extensions-dvdplayer" /> </files> diff --git a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py index 3d262c92..ddfe1989 100755 --- a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py +++ b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py @@ -39,7 +39,10 @@ class FileBrowser(Screen): currDir = "/media/dvd/" if not pathExists(currDir): currDir = "/" + if lastpath == "": # 'None' is magic to start at the list of mountpoints + currDir = None + inhibitDirs = ["/bin", "/boot", "/dev", "/etc", "/home", "/lib", "/proc", "/sbin", "/share", "/sys", "/tmp", "/usr", "/var"] self.filelist = FileList(currDir, matchingPattern = "(?i)^.*\.(iso)", useServiceRef = True) self["filelist"] = self.filelist @@ -79,6 +82,12 @@ class FileBrowser(Screen): lastpath = (pathname.rstrip("/").rsplit("/",1))[0] print "lastpath video_ts.ifo=", lastpath self.close(pathname) + if fileExists(pathname+"VIDEO_TS/VIDEO_TS.IFO"): + print "dvd structure found, trying to open..." + lastpath = (pathname.rstrip("/").rsplit("/",1))[0] + print "lastpath video_ts.ifo=", lastpath + pathname += "VIDEO_TS" + self.close(pathname) else: lastpath = filename[0:filename.rfind("/")] print "lastpath directory=", lastpath @@ -88,8 +97,8 @@ class FileBrowser(Screen): self.close(None) class DVDSummary(Screen): - skin = """ - <screen position="0,0" size="132,64"> + skin = ( + """<screen name="DVDSummary" position="0,0" size="132,64" id="1"> <widget source="session.CurrentService" render="Label" position="5,4" size="120,28" font="Regular;12" transparent="1" > <convert type="ServiceName">Name</convert> </widget> @@ -101,7 +110,20 @@ class DVDSummary(Screen): <widget source="session.CurrentService" render="Progress" position="6,46" size="60,18" borderWidth="1" > <convert type="ServicePosition">Position</convert> </widget> - </screen>""" + </screen>""", + """<screen name="DVDSummary" position="0,0" size="96,64" id="2"> + <widget source="session.CurrentService" render="Label" position="0,0" size="96,25" font="Regular;12" transparent="1" > + <convert type="ServiceName">Name</convert> + </widget> + <widget name="DVDPlayer" position="0,26" size="96,12" font="Regular;10" transparent="1" /> + <widget name="Chapter" position="0,40" size="66,12" font="Regular;10" transparent="1" halign="left" /> + <widget source="session.CurrentService" render="Label" position="66,40" size="30,12" font="Regular;10" transparent="1" halign="right" > + <convert type="ServicePosition">Position</convert> + </widget> + <widget source="session.CurrentService" render="Progress" position="0,52" size="96,12" borderWidth="1" > + <convert type="ServicePosition">Position</convert> + </widget> + </screen>""") def __init__(self, session, parent): Screen.__init__(self, session, parent) @@ -606,6 +628,14 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP newref = eServiceReference(4369, 0, val) print "play", newref.toString() if curref is None or curref != newref: + if newref.toString().endswith("/VIDEO_TS") or newref.toString().endswith("/"): + names = newref.toString().rsplit("/",3) + if names[2].startswith("Disk ") or names[2].startswith("DVD "): + name = str(names[1]) + " - " + str(names[2]) + else: + name = names[2] + print "setting name to: ", self.service + newref.setName(str(name)) self.session.nav.playService(newref) self.service = self.session.nav.getCurrentService() print "self.service", self.service diff --git a/lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am b/lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am index 27c751cf..3e2ee67c 100644 --- a/lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am +++ b/lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am @@ -1,17 +1,18 @@ -OBJS := servicedvd.cpp +AM_CPPFLAGS = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/include \ + -include Python.h \ + -include $(top_builddir)/enigma2_config.h --include $(OBJS:.cpp=.d) +AM_CXXFLAGS = @LIBDDVD_CFLAGS@ -installdir = $(pkglibdir)/python/Plugins/Extensions/DVDPlayer +plugindir = $(pkglibdir)/python/Plugins/Extensions/DVDPlayer -install_PYTHON = \ - servicedvd.so +plugin_LTLIBRARIES = servicedvd.la -servicedvd.so: - $(CXX) $(CPPFLAGS) -MD $(CXXFLAGS) $(DEFS) -I$(top_srcdir)/include \ - -Wall -W $(OBJS) -shared -fPIC -Wl,-soname,servicedvd.so -o servicedvd.so \ - $(LDFLAGS) -ldreamdvd +servicedvd_la_SOURCES = \ + servicedvd.cpp \ + servicedvd.h -all: servicedvd.so - -CLEANFILES = servicedvd.so servicedvd.d +servicedvd_la_LDFLAGS = -avoid-version -module +servicedvd_la_LIBADD = @LIBDDVD_LIBS@ diff --git a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp index 2ba53927..4ef00ab0 100644 --- a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp +++ b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp @@ -480,7 +480,10 @@ RESULT eServiceDVD::getName(std::string &name) if ( m_ddvd_titlestring[0] != '\0' ) name = m_ddvd_titlestring; else - name = m_ref.path; + if ( !m_ref.name.empty() ) + name = m_ref.name; + else + name = m_ref.path; return 0; } diff --git a/lib/python/Plugins/Extensions/GraphMultiEPG/meta/plugin_graphmultiepg.xml b/lib/python/Plugins/Extensions/GraphMultiEPG/meta/plugin_graphmultiepg.xml index a10840da..d3a2edf8 100755 --- a/lib/python/Plugins/Extensions/GraphMultiEPG/meta/plugin_graphmultiepg.xml +++ b/lib/python/Plugins/Extensions/GraphMultiEPG/meta/plugin_graphmultiepg.xml @@ -3,23 +3,14 @@ <tag type="EPG" /> <tag type="Recording" /> </prerequisites> - <info language="en"> + <info> <author>Dream Multimedia</author> <name>GraphMultiEPG</name> - <packagename>eenigma2-plugin-extensions-graphmultiepg</packagename> - <shortdescription>GraphMultiEPG shows a graphical timeline EPG.</shortdescription> + <packagename>enigma2-plugin-extensions-graphmultiepg</packagename> + <shortdescription>GraphMultiEPG shows a graphical timeline EPG</shortdescription> <description>GraphMultiEPG shows a graphical timeline EPG.\nShows a nice overview of all running und upcoming tv shows.</description> <screenshot src="http://www.dreamboxupdate.com/preview/plugin_graphmultiepg_en.jpg" /> </info> - <info language="de"> - <author>Dream Multimedia</author> - <name>GraphMultiEPG</name> - <packagename>enigma2-plugin-extensions-graphmultiepg</packagename> - <shortdescription>Zeigt ein grafisches Zeitlinien-EPG.</shortdescription> - <description>Zeigt ein grafisches Zeitlinien-EPG.\nZeigt eine grafische Übersicht aller laufenden und kommenden Sendungen. - </description> - <screenshot src="http://www.dreamboxupdate.com/preview/plugin_graphmultiepg_de.jpg" /> - </info> <files type="package"> <!-- without version, without .ipk --> <file type="package" name="enigma2-plugin-extensions-graphmultiepg" /> </files> diff --git a/lib/python/Plugins/Extensions/Makefile.am b/lib/python/Plugins/Extensions/Makefile.am index 5a6e3f3a..7a3a9be2 100755 --- a/lib/python/Plugins/Extensions/Makefile.am +++ b/lib/python/Plugins/Extensions/Makefile.am @@ -1,6 +1,10 @@ installdir = $(pkglibdir)/python/Plugins/Extensions -SUBDIRS = TuxboxPlugins CutListEditor PicturePlayer MediaScanner MediaPlayer GraphMultiEPG SocketMMI DVDPlayer DVDBurn Modem +SUBDIRS = TuxboxPlugins CutListEditor PicturePlayer MediaScanner MediaPlayer GraphMultiEPG SocketMMI DVDBurn Modem + +if HAVE_LIBDDVD +SUBDIRS += DVDPlayer +endif install_PYTHON = \ __init__.py diff --git a/lib/python/Plugins/Extensions/MediaPlayer/meta/plugin_mediaplayer.xml b/lib/python/Plugins/Extensions/MediaPlayer/meta/plugin_mediaplayer.xml index 2f9f22bf..ffbb8e89 100755 --- a/lib/python/Plugins/Extensions/MediaPlayer/meta/plugin_mediaplayer.xml +++ b/lib/python/Plugins/Extensions/MediaPlayer/meta/plugin_mediaplayer.xml @@ -2,23 +2,14 @@ <prerequisites> <tag type="Multimedia" /> </prerequisites> - <info language="en"> + <info> <author>Dream Multimedia</author> <name>MediaPlayer</name> <packagename>enigma2-plugin-extensions-mediaplayer</packagename> - <shortdescription>Mediaplayer plays your favorite music and videos.</shortdescription> + <shortdescription>Plays your favorite music and videos</shortdescription> <description>Mediaplayer plays your favorite music and videos.\nPlay all your favorite music and video files, organize them in playlists, view cover and album information.</description> <screenshot src="http://www.dreamboxupdate.com/preview/plugin_mediaplayer_en.jpg" /> </info> - <info language="de"> - <author>Dream Multimedia</author> - <name>MediaPlayer</name> - <packagename>enigma2-plugin-extensions-mediaplayer</packagename> - <shortdescription>Mediaplayer spielt Ihre Musik und Videos.</shortdescription> - <description>Mediaplayer spielt Ihre Musik und Videos.\nSie können all Ihre Musik- und Videodateien abspielen, in Playlisten organisieren, Cover und Albuminformationen abrufen. - </description> - <screenshot src="http://www.dreamboxupdate.com/preview/plugin_mediaplayer_de.jpg" /> - </info> <files type="package"> <!-- without version, without .ipk --> <file type="package" name="enigma2-plugin-extensions-mediaplayer" /> </files> diff --git a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py index 036bbbb9..d61dbc76 100755 --- a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py +++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py @@ -110,7 +110,7 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB # 'None' is magic to start at the list of mountpoints defaultDir = config.mediaplayer.defaultDir.getValue() - self.filelist = FileList(defaultDir, matchingPattern = "(?i)^.*\.(mp2|mp3|ogg|ts|wav|wave|m3u|pls|e2pls|mpg|vob|avi|divx|m4v|mkv|mp4|m4a|dat|flac|mov)", useServiceRef = True, additionalExtensions = "4098:m3u 4098:e2pls 4098:pls") + self.filelist = FileList(defaultDir, matchingPattern = "(?i)^.*\.(mp2|mp3|ogg|ts|wav|wave|m3u|pls|e2pls|mpg|vob|avi|divx|m4v|mkv|mp4|m4a|dat|flac|mov|m2ts)", useServiceRef = True, additionalExtensions = "4098:m3u 4098:e2pls 4098:pls") self["filelist"] = self.filelist self.playlist = MyPlayList() @@ -901,11 +901,11 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB def unPauseService(self): self.setSeekState(self.SEEK_STATE_PLAY) - + def subtitleSelection(self): - from Screens.Subtitles import Subtitles - self.session.open(Subtitles, self) - + from Screens.AudioSelection import SubtitleSelection + self.session.open(SubtitleSelection, self) + def hotplugCB(self, dev, media_state): if dev == harddiskmanager.getCD(): if media_state == "1": @@ -925,12 +925,17 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB self.clear_playlist() class MediaPlayerLCDScreen(Screen): - skin = """ - <screen position="0,0" size="132,64" title="LCD Text"> + skin = ( + """<screen name="MediaPlayerLCDScreen" position="0,0" size="132,64" id="1"> <widget name="text1" position="4,0" size="132,35" font="Regular;16"/> <widget name="text3" position="4,36" size="132,14" font="Regular;10"/> <widget name="text4" position="4,49" size="132,14" font="Regular;10"/> - </screen>""" + </screen>""", + """<screen name="MediaPlayerLCDScreen" position="0,0" size="96,64" id="2"> + <widget name="text1" position="0,0" size="96,35" font="Regular;14"/> + <widget name="text3" position="0,36" size="96,14" font="Regular;10"/> + <widget name="text4" position="0,49" size="96,14" font="Regular;10"/> + </screen>""") def __init__(self, session, parent): Screen.__init__(self, session) diff --git a/lib/python/Plugins/Extensions/MediaPlayer/settings.py b/lib/python/Plugins/Extensions/MediaPlayer/settings.py index 0b95812f..7f42677d 100755 --- a/lib/python/Plugins/Extensions/MediaPlayer/settings.py +++ b/lib/python/Plugins/Extensions/MediaPlayer/settings.py @@ -12,6 +12,8 @@ config.mediaplayer.repeat = ConfigYesNo(default=False) config.mediaplayer.savePlaylistOnExit = ConfigYesNo(default=True) config.mediaplayer.saveDirOnExit = ConfigYesNo(default=False) config.mediaplayer.defaultDir = ConfigDirectory() +config.mediaplayer.useAlternateUserAgent = ConfigYesNo(default=False) +config.mediaplayer.alternateUserAgent = ConfigText(default="") class DirectoryBrowser(Screen, HelpableScreen): diff --git a/lib/python/Plugins/Extensions/MediaScanner/meta/plugin_mediascanner.xml b/lib/python/Plugins/Extensions/MediaScanner/meta/plugin_mediascanner.xml index eced924f..eb9de1b6 100755 --- a/lib/python/Plugins/Extensions/MediaScanner/meta/plugin_mediascanner.xml +++ b/lib/python/Plugins/Extensions/MediaScanner/meta/plugin_mediascanner.xml @@ -1,25 +1,15 @@ <default> <prerequisites> - <tag type="Multimedia" /> <tag type="System" /> </prerequisites> - <info language="en"> + <info> <author>Dream Multimedia</author> <name>MediaScanner</name> <packagename>enigma2-plugin-extensions-mediascanner</packagename> - <shortdescription>MediaScanner scans devices for playable media files.</shortdescription> + <shortdescription>Scan devices for playable media files</shortdescription> <description>MediaScanner scans devices for playable media files and displays a menu with possible actions like viewing pictures or playing movies.</description> <screenshot src="http://www.dreamboxupdate.com/preview/plugin_mediascanner_en.jpg" /> </info> - <info language="de"> - <author>Dream Multimedia</author> - <name>MediaScanner</name> - <packagename>enigma2-plugin-extensions-mediascanner</packagename> - <shortdescription>MediaScanner durchsucht Geräte nach Mediendateien.</shortdescription> - <description>MediaScanner durchsucht Geräte nach Mediendateien und bietet Ihnen die dazu passenden Aktionen an wie z.B. Bilder betrachten oder Videos abspielen. - </description> - <screenshot src="http://www.dreamboxupdate.com/preview/plugin_mediascanner_en.jpg" /> - </info> <files type="package"> <!-- without version, without .ipk --> <file type="package" name="enigma2-plugin-extensions-mediascanner" /> </files> diff --git a/lib/python/Plugins/Extensions/PicturePlayer/meta/plugin_pictureplayer.xml b/lib/python/Plugins/Extensions/PicturePlayer/meta/plugin_pictureplayer.xml index faff9785..16e2ec90 100755 --- a/lib/python/Plugins/Extensions/PicturePlayer/meta/plugin_pictureplayer.xml +++ b/lib/python/Plugins/Extensions/PicturePlayer/meta/plugin_pictureplayer.xml @@ -2,23 +2,14 @@ <prerequisites> <tag type="Multimedia" /> </prerequisites> - <info language="en"> + <info> <author>Dream Multimedia</author> <name>PicturePlayer</name> <packagename>enigma2-plugin-extensions-pictureplayer</packagename> - <shortdescription>PicturePlayer displays your photos on the TV.</shortdescription> + <shortdescription>Display your photos on the TV</shortdescription> <description>The PicturePlayer displays your photos on the TV.\nYou can view them as thumbnails or slideshow.</description> <screenshot src="http://www.dreamboxupdate.com/preview/plugin_pictureplayer.jpg" /> </info> - <info language="de"> - <author>Dream Multimedia</author> - <name>Bildbetrachter</name> - <packagename>enigma2-plugin-extensions-pictureplayer</packagename> - <shortdescription>Der Bildbetrachter zeigt Ihre Bilder auf dem Fernseher an.</shortdescription> - <description>Der Bildbetrachter zeigt Ihre Bilder auf dem Fernseher an.\nSie können sich Ihre Bilder als Thumbnails, einzeln oder als Slideshow anzeigen lassen. - </description> - <screenshot src="http://www.dreamboxupdate.com/preview/plugin_pictureplayer.jpg" /> - </info> <files type="package"> <!-- without version, without .ipk --> <file type="package" name="enigma2-plugin-extensions-pictureplayer" /> </files> diff --git a/lib/python/Plugins/Extensions/SocketMMI/meta/plugin_socketmmi.xml b/lib/python/Plugins/Extensions/SocketMMI/meta/plugin_socketmmi.xml index acf8374d..3eaf8fc5 100644..100755 --- a/lib/python/Plugins/Extensions/SocketMMI/meta/plugin_socketmmi.xml +++ b/lib/python/Plugins/Extensions/SocketMMI/meta/plugin_socketmmi.xml @@ -2,20 +2,13 @@ <prerequisites> <tag type="System" /> </prerequisites> - <info language="en"> + <info> <author>Dream Multimedia</author> <name>SocketMMI</name> <packagename>enigma2-plugin-extensions-socketmmi</packagename> - <shortdescription>Python frontend for /tmp/mmi.socket.</shortdescription> + <shortdescription>Frontend for /tmp/mmi.socket</shortdescription> <description>Python frontend for /tmp/mmi.socket.</description> </info> - <info language="de"> - <author>Dream Multimedia</author> - <name>SocketMMI</name> - <packagename>enigma2-plugin-extensions-socketmmi</packagename> - <shortdescription>Python frontend für /tmp/mmi.socket.</shortdescription> - <description>Python frontend für /tmp/mmi.socket.</description> - </info> <files type="package"> <!-- without version, without .ipk --> <file type="package" name="enigma2-plugin-extensions-socketmmi" /> </files> diff --git a/lib/python/Plugins/Extensions/SocketMMI/src/Makefile.am b/lib/python/Plugins/Extensions/SocketMMI/src/Makefile.am index 8e80e183..5ce7d031 100644 --- a/lib/python/Plugins/Extensions/SocketMMI/src/Makefile.am +++ b/lib/python/Plugins/Extensions/SocketMMI/src/Makefile.am @@ -1,17 +1,15 @@ -OBJS = socket_mmi.cpp +AM_CPPFLAGS = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/include \ + -include Python.h \ + -include $(top_builddir)/enigma2_config.h --include $(OBJS:.cpp=.d) +plugindir = $(pkglibdir)/python/Plugins/Extensions/SocketMMI -installdir = $(pkglibdir)/python/Plugins/Extensions/SocketMMI +plugin_LTLIBRARIES = socketmmi.la -install_PYTHON = \ - socketmmi.so +socketmmi_la_SOURCES = \ + socket_mmi.cpp \ + socket_mmi.h -socketmmi.so: socket_mmi.cpp socket_mmi.h - $(CXX) $(CPPFLAGS) -MD $(CXXFLAGS) $(DEFS) -I$(top_srcdir)/include \ - -Wall -W $(OBJS) -shared -fPIC -Wl,-soname,socketmmi.so -o socketmmi.so \ - $(LDFLAGS) - -all: socketmmi.so - -CLEANFILES = socketmmi.so socketmmi.d +socketmmi_la_LDFLAGS = -avoid-version -module diff --git a/lib/python/Plugins/Extensions/TuxboxPlugins/meta/plugin_tuxboxplugins.xml b/lib/python/Plugins/Extensions/TuxboxPlugins/meta/plugin_tuxboxplugins.xml index 734c48f1..7ca10826 100644..100755 --- a/lib/python/Plugins/Extensions/TuxboxPlugins/meta/plugin_tuxboxplugins.xml +++ b/lib/python/Plugins/Extensions/TuxboxPlugins/meta/plugin_tuxboxplugins.xml @@ -2,20 +2,13 @@ <prerequisites> <tag type="System" /> </prerequisites> - <info language="en"> + <info> <author>Dream Multimedia</author> <name>TuxboxPlugins</name> <packagename>TuxboxPlugins</packagename> - <shortdescription>Allows the execution of TuxboxPlugins.</shortdescription> + <shortdescription>Execute TuxboxPlugins</shortdescription> <description>Allows the execution of TuxboxPlugins.</description> </info> - <info language="de"> - <author>Dream Multimedia</author> - <name>TuxboxPlugins</name> - <packagename>enigma2-plugin-extensions-tuxboxplugins</packagename> - <shortdescription>Erlaubt das Ausführen von TuxboxPlugins.</shortdescription> - <description>Erlaubt das Ausführen von TuxboxPlugins.</description> - </info> <files type="package"> <!-- without version, without .ipk --> <file type="package" name="enigma2-plugin-extensions-tuxboxplugins" /> </files> |