X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/51550aa81c726aedfa7159af0e67f8bcd5fb8a2f..6755057d62f079b1517ecc0b6bda2869fbaf4bc6:/lib/python/Plugins/Extensions/MediaPlayer/plugin.py diff --git a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py index 267ada1c..ab506590 100644 --- a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py +++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py @@ -1,18 +1,18 @@ -from os import path as os_path, remove as os_remove, listdir as os_listdir +from os import path as os_path, remove as os_remove, listdir as os_listdir, popen from time import strftime -from enigma import eTimer, eServiceCenter, iServiceInformation +from enigma import iPlayableService, eTimer, eServiceCenter, iServiceInformation from Screens.Screen import Screen from Screens.MessageBox import MessageBox from Screens.InputBox import InputBox from Components.ActionMap import NumberActionMap, HelpableActionMap from Components.Label import Label -from Components.Pixmap import Pixmap +from Components.Pixmap import Pixmap,MultiPixmap from Components.Label import Label from Components.FileList import FileList from Components.MediaPlayer import PlayList from Tools.Directories import resolveFilename, SCOPE_CONFIG, SCOPE_PLAYLIST, SCOPE_SKIN_IMAGE from Components.ServicePosition import ServicePositionGauge -from Components.ServiceEventTracker import InfoBarBase +from Components.ServiceEventTracker import ServiceEventTracker, InfoBarBase from Components.Playlist import PlaylistIOInternal, PlaylistIOM3U, PlaylistIOPLS from Screens.InfoBarGenerics import InfoBarSeek, InfoBarAudioSelection, InfoBarCueSheetSupport, InfoBarNotifications from ServiceReference import ServiceReference @@ -63,7 +63,7 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB self.addPlaylistParser(PlaylistIOInternal, "e2pls") # 'None' is magic to start at the list of mountpoints - self.filelist = FileList(None, matchingPattern = "(?i)^.*\.(mp3|ogg|ts|wav|wave|m3u|pls|e2pls|mpg|vob)", useServiceRef = True, additionalExtensions = "4098:m3u 4098:e2pls 4098:pls") + self.filelist = FileList(None, matchingPattern = "(?i)^.*\.(mp3|ogg|ts|wav|wave|m3u|pls|e2pls|mpg|vob|avi)", useServiceRef = True, additionalExtensions = "4098:m3u 4098:e2pls 4098:pls") self["filelist"] = self.filelist self.playlist = MyPlayList() @@ -87,7 +87,9 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB self["genretext"] = Label(_("Genre:")) self["genre"] = Label("") self["coverArt"] = MediaPixmap() + self["repeat"] = MultiPixmap() + self.repeat = False self.seek_target = None class MoviePlayerActionMap(NumberActionMap): @@ -161,6 +163,8 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB self.currList = "filelist" self.coverArtFileName = "" + self.isAudioCD = False + self.AudioCD_albuminfo = {} self.playlistIOInternal = PlaylistIOInternal() list = self.playlistIOInternal.open(resolveFilename(SCOPE_CONFIG, "playlist.e2pls")) @@ -169,6 +173,11 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB self.playlist.addFile(x.ref) self.playlist.updateList() + self.__event_tracker = ServiceEventTracker(screen=self, eventmap= + { + iPlayableService.evUpdatedInfo: self.__evUpdatedInfo + }) + def doNothing(self): pass @@ -183,7 +192,8 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB self.playlistIOInternal.clear() for x in self.playlist.list: self.playlistIOInternal.addService(ServiceReference(x[0])) - self.playlistIOInternal.save(resolveFilename(SCOPE_CONFIG, "playlist.e2pls")) + if not self.isAudioCD: + self.playlistIOInternal.save(resolveFilename(SCOPE_CONFIG, "playlist.e2pls")) self.close() def checkSkipShowHideLock(self): @@ -198,6 +208,14 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB def __onClose(self): self.session.nav.playService(self.oldService) + def __evUpdatedInfo(self): + currPlay = self.session.nav.getCurrentService() + currenttitle = currPlay.info().getInfo(iServiceInformation.sCurrentTitle) + totaltitles = currPlay.info().getInfo(iServiceInformation.sTotalTitles) + sTitle = currPlay.info().getInfoString(iServiceInformation.sTitle) + print "[__evUpdatedInfo] title %d of %d (%s)" % (currenttitle, totaltitles, sTitle) + self.readTitleInformation() + def delMPTimer(self): del self.rightKeyTimer del self.leftKeyTimer @@ -205,15 +223,29 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB def readTitleInformation(self): currPlay = self.session.nav.getCurrentService() if currPlay is not None: - stitle = currPlay.info().getInfoString(iServiceInformation.sTitle) - if stitle == "": - stitle = currPlay.info().getName().split('/')[-1] - - self.updateMusicInformation( artist = currPlay.info().getInfoString(iServiceInformation.sArtist), - title = stitle, - album = currPlay.info().getInfoString(iServiceInformation.sAlbum), - genre = currPlay.info().getInfoString(iServiceInformation.sGenre), - clear = True) + sTitle = currPlay.info().getInfoString(iServiceInformation.sTitle) + sAlbum = currPlay.info().getInfoString(iServiceInformation.sAlbum) + sGenre = currPlay.info().getInfoString(iServiceInformation.sGenre) + sArtist = currPlay.info().getInfoString(iServiceInformation.sArtist) + sYear = "" + + if sTitle == "": + if not self.isAudioCD: + sTitle = currPlay.info().getName().split('/')[-1] + else: + sTitle = self.playlist.getServiceRefList()[self.playlist.getCurrentIndex()].getName() + + if self.AudioCD_albuminfo: + if sAlbum == "" and "title" in self.AudioCD_albuminfo: + sAlbum = self.AudioCD_albuminfo["title"] + if sGenre == "" and "genre" in self.AudioCD_albuminfo: + sGenre = self.AudioCD_albuminfo["genre"] + if sArtist == "" and "artist" in self.AudioCD_albuminfo: + sArtist = self.AudioCD_albuminfo["artist"] + if "year" in self.AudioCD_albuminfo: + sYear = self.AudioCD_albuminfo["year"] + + self.updateMusicInformation( sArtist, sTitle, sAlbum, sYear, sGenre, clear = True ) else: self.updateMusicInformation() @@ -302,6 +334,13 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB def hideAfterResume(self): self.hide() + def getIdentifier(self, ref): + if self.isAudioCD: + return ref.getName() + else: + text = ref.getPath() + return text.split('/')[-1] + # FIXME: maybe this code can be optimized def updateCurrentInfo(self): text = "" @@ -349,16 +388,14 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB if t is None: return #display current selected entry on LCD - text = t.getPath() - text = text.split('/')[-1] + text = self.getIdentifier(t) self.summaries.setText(text,1) self["currenttext"].setText(text) idx = self.playlist.getSelectionIndex() idx += 1 if idx < len(self.playlist): currref = self.playlist.getServiceRefList()[idx] - text = currref.getPath() - text = text.split('/')[-1] + text = self.getIdentifier(currref) self.summaries.setText(text,3) else: self.summaries.setText(" ",3) @@ -366,8 +403,7 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB idx += 1 if idx < len(self.playlist): currref = self.playlist.getServiceRefList()[idx] - text = currref.getPath() - text = text.split('/')[-1] + text = self.getIdentifier(currref) self.summaries.setText(text,4) else: self.summaries.setText(" ",4) @@ -403,6 +439,7 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB menu.append((_("save playlist"), "saveplaylist")); menu.append((_("load playlist"), "loadplaylist")); menu.append((_("delete saved playlist"), "deleteplaylist")); + menu.append((_("repeat playlist"), "repeat")); self.session.openWithCallback(self.menuCallback, ChoiceBox, title="", list=menu) def menuCallback(self, choice): @@ -438,7 +475,13 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB self.delete_saved_playlist() elif choice[1] == "shuffle": self.playlist.PlayListShuffle() - + elif choice[1] == "repeat": + if self.repeat == True: + self.repeat = False + self["repeat"].setPixmapNum(0) + else: + self.repeat = True + self["repeat"].setPixmapNum(1) def showEventInformation(self): from Screens.EventView import EventViewSimple @@ -565,6 +608,9 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB next = self.playlist.getCurrentIndex() + 1 if next < len(self.playlist): self.changeEntry(next) + elif ( len(self.playlist) > 0 ) and ( self.repeat == True ): + self.stopEntry() + self.changeEntry(0) def nextMarkOrEntry(self): if not self.jumpPreviousNextMark(lambda x: x): @@ -626,13 +672,12 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB # display just playing musik on LCD idx = self.playlist.getCurrentIndex() currref = self.playlist.getServiceRefList()[idx] - text = currref.getPath() - text = text.split('/')[-1] + text = self.getIdentifier(currref) text = ">"+text ext = text[-3:].lower() # FIXME: the information if the service contains video (and we should hide our window) should com from the service instead - if ext not in ["mp3", "wav", "ogg"]: + if ext not in ["mp3", "wav", "ogg"] and not self.isAudioCD: self.hide() else: needsInfoUpdate = True @@ -642,8 +687,7 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB idx += 1 if idx < len(self.playlist): currref = self.playlist.getServiceRefList()[idx] - text = currref.getPath() - text = text.split('/')[-1] + text = self.getIdentifier(currref) self.summaries.setText(text,3) else: self.summaries.setText(" ",3) @@ -651,8 +695,7 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB idx += 1 if idx < len(self.playlist): currref = self.playlist.getServiceRefList()[idx] - text = currref.getPath() - text = text.split('/')[-1] + text = self.getIdentifier(currref) self.summaries.setText(text,4) else: self.summaries.setText(" ",4) @@ -661,7 +704,7 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB currref = self.playlist.getServiceRefList()[idx] text = currref.getPath() ext = text[-3:].lower() - if ext not in ["mp3", "wav", "ogg"]: + if ext not in ["mp3", "wav", "ogg"] and not self.isAudioCD: self.hide() else: needsInfoUpdate = True @@ -698,7 +741,6 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB def unPauseService(self): self.setSeekState(self.SEEK_STATE_PLAY) - class MediaPlayerLCDScreen(Screen): skin = """ @@ -742,17 +784,39 @@ def filescan_open(list, session, **kwargs): mp.switchToPlayList() for file in list: - ref = eServiceReference(4097, 0, file.path) + if file.mimetype == "video/MP2T": + stype = 1 + else: + stype = 4097 + ref = eServiceReference(stype, 0, file.path) mp.playlist.addFile(ref) # TODO: rather play first than last file? mp.playServiceRefEntry(ref) mp.playlist.updateList() +def audioCD_open(list, session, **kwargs): + from enigma import eServiceReference + + mp = session.open(MediaPlayer) + + mp.playlist.clear() + mp.isAudioCD = True + + for file in list: + ref = eServiceReference(4097, 0, file.path) + mp.playlist.addFile(ref) + from Plugins.Extensions.CDInfo.plugin import Query + cdinfo = Query(mp) + cdinfo.scan() + + mp.changeEntry(0) + mp.switchToPlayList() + def filescan(**kwargs): from Components.Scanner import Scanner, ScanPath - return [ - Scanner(mimetypes = ["video/mpeg"], + mediatypes = [ + Scanner(mimetypes = ["video/mpeg", "video/MP2T", "video/x-msvideo"], paths_to_scan = [ ScanPath(path = "", with_subdirs = False), @@ -769,8 +833,21 @@ def filescan(**kwargs): name = "Music", description = "Play Music...", openfnc = filescan_open, - ) - ] + )] + try: + from Plugins.Extensions.CDInfo.plugin import Query + mediatypes.insert(0,Scanner(mimetypes = ["audio/x-cda", "audio/x-wav"], + paths_to_scan = + [ + ScanPath(path = "", with_subdirs = False), + ], + name = "Audio-CD", + description = "Play Audio-CD...", + openfnc = audioCD_open, + )) + return mediatypes + except ImportError: + return mediatypes from Plugins.Plugin import PluginDescriptor def Plugins(**kwargs):