diff --git a/README.md b/README.md
index e8dc692..b668fe3 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,5 @@
-# mediaplayer2
-mediaplayer2 is enigma2 plugin based on OpenPli mediaplayer plugin with added support for subssupport plugin for enhanced subtitles support.
+# mediaplayer3
+mediaplayer3 is enigma2 plugin based on OpenPli mediaplayer plugin with added support for subssupport plugin for enhanced subtitles support.
+Based on Mediaplayer2 from https://github.com/mx3L/mediaplayer2
 
-[Download latest versions](http://dl.bintray.com/mx3l/generic/)
-
-[More information] (https://code.google.com/p/mediaplayer2-for-sh4/)
 
diff --git a/create_ipk.sh b/create_ipk.sh
index 8ca8a14..42b2662 100755
--- a/create_ipk.sh
+++ b/create_ipk.sh
@@ -14,8 +14,8 @@ GITVER=$(git log -1 --format="%ci" | awk -F" " '{ print $1 }' | tr -d "-")
 #DSTAGEVER="6"
 VER=$PVER-$GITVER
 
-PKG=${D}/enigma2-plugin-extensions-mediaplayer2_${VER}_all
-PLUGINPATH=/usr/lib/enigma2/python/Plugins/Extensions/MediaPlayer2
+PKG=${D}/enigma2-plugin-extensions-mediaplayer3_${VER}_all
+PLUGINPATH=/usr/lib/enigma2/python/Plugins/Extensions/MediaPlayer3
 popd &> /dev/null
 
 rm -rf ${D}/ipkg.src*
@@ -29,7 +29,7 @@ mkdir -p ${S}
 git archive --format=tar HEAD | (cd ${S} && tar xf -)
 
 cat > ${P}/CONTROL/control << EOF
-Package: enigma2-plugin-extensions-mediaplayer2
+Package: enigma2-plugin-extensions-mediaplayer3
 Version: ${VER}
 Architecture: all
 Section: extra
@@ -37,13 +37,13 @@ Priority: optional
 Maintainer: mxfitsat@gmail.com
 Depends: enigma2-plugin-extensions-subssupport (>=1.5.1)
 Recommends: python-sqlite3
-Homepage: https://code.google.com/p/mediaplayer2-for-sh4/
+Homepage: https://github.com/onni-k/mediaplayer3
 Description: MediaPlayer with external subtitle support $VER
 EOF
 
 cat > ${P}/CONTROL/postrm << EOF
 #!/bin/sh
-rm -r /usr/lib/enigma2/python/Plugins/Extensions/MediaPlayer2 2> /dev/null
+rm -r /usr/lib/enigma2/python/Plugins/Extensions/MediaPlayer3 2> /dev/null
 exit 0
 EOF
 
@@ -58,7 +58,7 @@ languages=($(ls -d */ | gsed 's/\/$//g; s/.*\///g'))
 cd -
 for lang in "${languages[@]}" ; do
 	printf "Generating mo files for %s\n" $lang
-	msgfmt ${P}${PLUGINPATH}/locale/${lang}/LC_MESSAGES/MediaPlayer2.po -o ${P}${PLUGINPATH}/locale/${lang}/LC_MESSAGES/MediaPlayer2.mo
+	msgfmt ${P}${PLUGINPATH}/locale/${lang}/LC_MESSAGES/MediaPlayer3.po -o ${P}${PLUGINPATH}/locale/${lang}/LC_MESSAGES/MediaPlayer3.mo
 done
 
 #echo "compiling to optimized python bytecode"
@@ -68,9 +68,9 @@ done
 find ${P} -name "*.pyo" -print -exec rm {} \;
 find ${P} -name "*.pyc" -print -exec rm {} \;
 
-mkdir -p ${P}/tmp/mediaplayer2
-mkdir -p ${P}/tmp/mediaplayer2/python2.6/
-mkdir -p ${P}/tmp/mediaplayer2/python2.7/
+mkdir -p ${P}/tmp/mediaplayer3
+mkdir -p ${P}/tmp/mediaplayer3/python2.6/
+mkdir -p ${P}/tmp/mediaplayer3/python2.7/
 
 tar -C ${P} -cz --format=gnu -f ${B}/data.tar.gz . --exclude=CONTROL
 tar -C ${P}/CONTROL -cz --format=gnu -f ${B}/control.tar.gz .
diff --git a/enigma2-plugin-extensions-mediaplayer2_0.62.bb b/enigma2-plugin-extensions-mediaplayer2_0.62.bb
index 53ff63e..6469d5f 100644
--- a/enigma2-plugin-extensions-mediaplayer2_0.62.bb
+++ b/enigma2-plugin-extensions-mediaplayer2_0.62.bb
@@ -1,5 +1,5 @@
-SUMMARY = "MediaPlayer2 for Enigma2"
-HOMEPAGE = "https://github.com/mx3L/mediaplayer2"
+SUMMARY = "MediaPlayer3 for Enigma2"
+HOMEPAGE = "https://github.com/onni-k/mediaplayer3"
 LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
@@ -9,7 +9,7 @@ SRCREV = "3a21a388e7326cba690666cec5324f8da35d50d8"
 PV = "0.62"
 PR = "r0"
 
-SRC_URI = "git://github.com/mx3L/mediaplayer2;protocol=git;branch=master"
+SRC_URI = "git://github.com/onni-k/mediaplayer3;protocol=git;branch=master"
 
 S = "${WORKDIR}/git"
 
@@ -23,12 +23,12 @@ do_compile () {
 }
 
 do_install () {
-    mkdir -p ${D}/${libdir}/enigma2/python/Plugins/Extensions/MediaPlayer2
-    cp -r ${S}/plugin/* ${D}/${libdir}/enigma2/python/Plugins/Extensions/MediaPlayer2/
+    mkdir -p ${D}/${libdir}/enigma2/python/Plugins/Extensions/MediaPlayer3
+    cp -r ${S}/plugin/* ${D}/${libdir}/enigma2/python/Plugins/Extensions/MediaPlayer3/
 }
 
 pkg_postrm_${PN} () {
-    rm -rf ${libdir}/enigma2/python/Plugins/Extensions/MediaPlayer2
+    rm -rf ${libdir}/enigma2/python/Plugins/Extensions/MediaPlayer3
 }
 
 FILES_${PN} = "${libdir}/enigma2/python/Plugins/Extensions/MediaPlayer2"
diff --git a/install.sh b/install.sh
index 3b3ef22..ef9767b 100755
--- a/install.sh
+++ b/install.sh
@@ -55,13 +55,13 @@ fi
 echo "installing '${IPK_NAME}' to $E2_HOST..."
 if [ -f "$with_pass" ]; then
 	sshpass -p $E2_PASSWORD ssh $E2_USERNAME@$E2_HOST <<- EOFSSH > /dev/null
-		opkg remove enigma2-plugin-extensions-mediaplayer2
+		opkg remove enigma2-plugin-extensions-mediaplayer3
 		opkg --force-downgrade install /tmp/$IPK_NAME
 		rm /tmp/$IPK_NAME
 	EOFSSH
 else
 	ssh $E2_USERNAME@$E2_HOST <<- EOFSSH > /dev/null
-		opkg remove enigma2-plugin-extensions-mediaplayer2
+		opkg remove enigma2-plugin-extensions-mediaplayer3
 		opkg --force-downgrade install /tmp/$IPK_NAME
 		rm /tmp/$IPK_NAME
 	EOFSSH
diff --git a/plugin/plugin.py b/plugin/plugin.py
old mode 100755
new mode 100644
index 132c286..e8056c2
--- a/plugin/plugin.py
+++ b/plugin/plugin.py
@@ -1,1475 +1,1480 @@
-import os
-import random
-from time import strftime
-import traceback
-
-from Components.AVSwitch import AVSwitch
-from Components.ActionMap import ActionMap, HelpableActionMap
-from Components.FileList import FileList
-from Components.Harddisk import harddiskmanager
-from Components.Label import Label
-from Components.MediaPlayer import PlayList, STATE_STOP, STATE_NONE
-from Components.Pixmap import Pixmap, MultiPixmap
-from Components.Playlist import PlaylistIOInternal, PlaylistIOM3U, PlaylistIOPLS
-from Components.PluginComponent import plugins
-from Components.ServiceEventTracker import ServiceEventTracker, InfoBarBase
-from Components.ServicePosition import ServicePositionGauge
-from Components.config import config
-from Plugins.Plugin import PluginDescriptor
-from Screens.ChoiceBox import ChoiceBox
-from Screens.HelpMenu import HelpableScreen
-from Screens.InfoBarGenerics import InfoBarSeek, InfoBarAudioSelection, InfoBarNotifications, InfoBarExtensions, InfoBarPlugins
-from Screens.InputBox import InputBox
-from Screens.MessageBox import MessageBox
-from Screens.Screen import Screen
-from Tools.BoundFunction import boundFunction
-from Tools.Directories import fileExists, resolveFilename, \
-    SCOPE_CONFIG, SCOPE_PLAYLIST, SCOPE_CURRENT_SKIN
-
-from ServiceReference import ServiceReference
-from e2util import InfoBarAspectChange, StatusScreen, MyAudioSelection, \
-    MyInfoBarCueSheetSupport
-from compat import eConnectCallback
-from enigma import iPlayableService, eTimer, eServiceCenter, iServiceInformation, \
-    ePicLoad, getDesktop
-from settings import MediaPlayerSettings, LIBMEDIA_CHOICES, SERVICEMP3, SERVICE_GSTPLAYER, SERVICE_EXTEPLAYER3, SERVICE_EPLAYER3, ServiceGstPlayerApplySettings
-from skin import parseColor
-
-from . import _
-
-
-# init subtitles support
-try:
-    from Plugins.Extensions.SubsSupport import SubsSupport, SubsSupportStatus, initSubsSettings
-except ImportError as e:
-    traceback.print_exc()
-    raise Exception("Please install SubsSupport plugin")
-
-
-try:
-    from Components.MovieList import AUDIO_EXTENSIONS
-except ImportError:
-    AUDIO_EXTENSIONS = frozenset((".mp2", ".mp3", ".wav", ".ogg", ".flac", ".m4a"))
-
-
-class MyPlayList(PlayList):
-    def __init__(self):
-        PlayList.__init__(self)
-        self.state = STATE_NONE
-
-    def updateState(self, state):
-        self.state = state
-        PlayList.updateState(self, state)
-
-    def isStopped(self):
-        return self.state in (STATE_STOP, STATE_NONE)
-
-    def PlayListShuffle(self):
-        random.shuffle(self.list)
-        self.l.setList(self.list)
-        self.currPlaying = -1
-        self.oldCurrPlaying = -1
-
-class MediaPixmap(Pixmap):
-    def __init__(self):
-        Pixmap.__init__(self)
-        self.coverArtFileName = ""
-        self.picload = ePicLoad()
-        self.picload_conn = eConnectCallback(self.picload.PictureData, self.paintCoverArtPixmapCB)
-        self.coverFileNames = ["folder.png", "folder.jpg"]
-
-    def applySkin(self, desktop, screen):
-        from Tools.LoadPixmap import LoadPixmap
-        noCoverFile = None
-        if self.skinAttributes is not None:
-            for (attrib, value) in self.skinAttributes:
-                if attrib == "pixmap":
-                    noCoverFile = value
-                    break
-        if noCoverFile is None:
-            noCoverFile = resolveFilename(SCOPE_CURRENT_SKIN, "skin_default/no_coverArt.png")
-        self.noCoverPixmap = LoadPixmap(noCoverFile)
-        return Pixmap.applySkin(self, desktop, screen)
-
-    def onShow(self):
-        Pixmap.onShow(self)
-        sc = AVSwitch().getFramebufferScale()
-        # 0=Width 1=Height 2=Aspect 3=use_cache 4=resize_type 5=Background(#AARRGGBB)
-        self.picload.setPara((self.instance.size().width(), self.instance.size().height(), sc[0], sc[1], False, 1, "#00000000"))
-
-    def paintCoverArtPixmapCB(self, picInfo=None):
-        ptr = self.picload.getData()
-        if ptr != None:
-            self.instance.setPixmap(ptr.__deref__())
-
-    def updateCoverArt(self, path):
-        while not path.endswith("/"):
-            path = path[:-1]
-        new_coverArtFileName = None
-        for filename in self.coverFileNames:
-            if fileExists(path + filename):
-                new_coverArtFileName = path + filename
-        if self.coverArtFileName != new_coverArtFileName:
-            self.coverArtFileName = new_coverArtFileName
-            if new_coverArtFileName:
-                self.picload.startDecode(self.coverArtFileName)
-            else:
-                self.showDefaultCover()
-
-    def showDefaultCover(self):
-        self.instance.setPixmap(self.noCoverPixmap)
-
-    def embeddedCoverArt(self):
-        print "[embeddedCoverArt] found"
-        self.coverArtFileName = "/tmp/.id3coverart"
-        self.picload.startDecode(self.coverArtFileName)
-
-class MediaPlayerInfoBar(Screen):
-
-    def __init__(self, session):
-        Screen.__init__(self, session)
-        self.skinName = "MoviePlayer"
-
-
-class MediaPlayer(Screen, InfoBarBase, SubsSupportStatus, SubsSupport, InfoBarSeek, InfoBarAudioSelection, MyInfoBarCueSheetSupport, InfoBarExtensions, InfoBarPlugins, InfoBarNotifications, InfoBarAspectChange, HelpableScreen):
-    ALLOW_SUSPEND = True
-    ENABLE_RESUME_SUPPORT = True
-
-    def __init__(self, session, args=None):
-        Screen.__init__(self, session)
-        InfoBarAudioSelection.__init__(self)
-        InfoBarBase.__init__(self, steal_current_service=True)
-        InfoBarExtensions.__init__(self)
-        InfoBarPlugins.__init__(self)
-        InfoBarNotifications.__init__(self)
-        # for external subtitles
-        initSubsSettings()
-        SubsSupport.__init__(self, embeddedSupport=True, searchSupport=True)
-        SubsSupportStatus.__init__(self)
-        InfoBarAspectChange.__init__(self)
-        HelpableScreen.__init__(self)
-        self.summary = None
-        self.title = "MediaPlayer2"
-        self.oldService = self.session.nav.getCurrentlyPlayingServiceReference()
-        self.session.nav.stopService()
-
-        self.playlistparsers = {}
-        self.addPlaylistParser(PlaylistIOM3U, "m3u")
-        self.addPlaylistParser(PlaylistIOPLS, "pls")
-        self.addPlaylistParser(PlaylistIOInternal, "e2pls")
-
-        # 'None' is magic to start at the list of mountpoints
-        defaultDir = config.plugins.mediaplayer2.defaultDir.getValue()
-        self.filelist = FileList(defaultDir, matchingPattern="(?i)^.*\.(mp2|mp3|ogg|ts|mts|m2ts|wav|wave|m3u|pls|e2pls|mpg|vob|avi|divx|m4v|mkv|mp4|m4a|dat|flac|flv|mov|dts|3gp|3g2|asf|wmv|wma|iso|webm)", useServiceRef=True, additionalExtensions="4098:m3u 4098:e2pls 4098:pls")
-        self["filelist"] = self.filelist
-        
-        if config.plugins.mediaplayer2.useLibMedia.getValue() == True:
-            self.libMedia = int(config.plugins.mediaplayer2.libMedia.getValue())
-        else:
-            self.libMedia = SERVICEMP3
-
-        self.playlist = MyPlayList()
-        self.is_closing = False
-        self.delname = ""
-        self.playlistname = ""
-        self["playlist"] = self.playlist
-
-        self["PositionGauge"] = ServicePositionGauge(self.session.nav)
-
-        self["currenttext"] = Label("")
-
-        self["artisttext"] = Label(_("Artist") + ':')
-        self["artist"] = Label("")
-        self["titletext"] = Label(_("Title") + ':')
-        self["title"] = Label("")
-        self["albumtext"] = Label(_("Album") + ':')
-        self["album"] = Label("")
-        self["yeartext"] = Label(_("Year") + ':')
-        self["year"] = Label("")
-        self["genretext"] = Label(_("Genre") + ':')
-        self["genre"] = Label("")
-        self["coverArt"] = MediaPixmap()
-        self["repeat"] = MultiPixmap()
-
-        self.seek_target = None
-
-        try:
-            from Plugins.SystemPlugins.Hotplug.plugin import hotplugNotifier
-            hotplugNotifier.append(self.hotplugCB)
-        except Exception, ex:
-            print "[MediaPlayer] No hotplug support", ex
-
-        class MoviePlayerActionMap(ActionMap):
-            def __init__(self, player, contexts=[ ], actions={ }, prio=0):
-                ActionMap.__init__(self, contexts, actions, prio)
-                self.player = player
-
-            def action(self, contexts, action):
-                self.player.show()
-                return ActionMap.action(self, contexts, action)
-
-        self["OkCancelActions"] = HelpableActionMap(self, "OkCancelActions",
-            {
-                "ok": (self.ok, _("Add file to playlist")),
-                "cancel": (self.exit, _("Exit mediaplayer")),
-            }, -2)
-
-        self["MediaPlayerActions"] = HelpableActionMap(self, "MediaPlayer2Actions",
-            {
-                "info": (self.info, _("show info")),
-                "play": (self.xplayEntry, _("Play entry")),
-                "pause": (self.pauseEntry, _("Pause")),
-                "stop": (self.stopEntry, _("Stop entry")),
-                "previous": (self.previousMarkOrEntry, _("Play from previous mark or playlist entry")),
-                "next": (self.nextMarkOrEntry, _("Play from next mark or playlist entry")),
-                "menu": (self.showMenu, _("Menu")),
-                "skipListbegin": (self.skip_listbegin, _("Jump to beginning of list")),
-                "skipListend": (self.skip_listend, _("Jump to end of list")),
-                "prevBouquet": (self.switchLists, _("Switch to playlist")),
-                "nextBouquet": (self.switchLists, _("Switch to filelist")),
-                "delete": (self.deletePlaylistEntry, _("Delete playlist entry")),
-                "shift_stop": (self.clear_playlist, _("Clear playlist")),
-                "shift_record": (self.playlist.PlayListShuffle, _("Shuffle playlist")),
-                "subsStatus":(self.subsStatus, _("Show external subtitles status"))
-            }, -2)
-
-        self["InfobarEPGActions"] = HelpableActionMap(self, "InfobarEPGActions",
-            {
-                "showEventInfo": (self.showEventInformation, _("show event details")),
-            })
-
-        self["RLActions"] = ActionMap(["RightLeftActions"],
-        {
-            "right": self.rightDown,
-            "rightRepeated": self.doNothing,
-            "rightUp": self.rightUp,
-            "left": self.leftDown,
-            "leftRepeated": self.doNothing,
-            "leftUp": self.leftUp,
-        }, -2)
-
-        self["actions"] = MoviePlayerActionMap(self, ["UpDownActions"],
-        {
-            "up": self.up,
-            "upRepeated": self.up,
-            "upUp": self.doNothing,
-            "down": self.down,
-            "downRepeated": self.down,
-            "downUp": self.doNothing,
-        }, -2)
-
-        InfoBarSeek.__init__(self, actionmap="MediaPlayer2SeekActions")
-
-        self.mediaPlayerInfoBar = self.session.instantiateDialog(MediaPlayerInfoBar)
-        self.statusScreen = self.session.instantiateDialog(StatusScreen)
-        mpGaugeRenderer = self.getGaugeRenderer(self.mediaPlayerInfoBar.renderer)
-        gaugeRenderers = mpGaugeRenderer and [mpGaugeRenderer] or []
-        cueSheetForServicemp3 = config.plugins.mediaplayer2.cueSheetForServicemp3.value
-        MyInfoBarCueSheetSupport.__init__(self, "MediaPlayerCueSheetActions", "mp2cuesheet", gaugeRenderers, cueSheetForServicemp3)
-
-        self.onStopPlayback = [self.saveLastPositionIfEnabled]
-        self.onStartPlayback = [self.saveLastPositionIfEnabled]
-
-        self.onClose.append(self.delMPTimer)
-        self.onClose.append(self.__onClose)
-        self.onHide.append(self.showServiceSummary)
-        self.onShow.append(self.hideServiceSummary)
-        self.onShow.append(self.timerHideMediaPlayerInfoBar)
-
-        self.righttimer = False
-        self.rightKeyTimer = eTimer()
-        self.rightKeyTimer_conn = eConnectCallback(self.rightKeyTimer.timeout, self.rightTimerFire)
-
-        self.lefttimer = False
-        self.leftKeyTimer = eTimer()
-        self.leftKeyTimer_conn = eConnectCallback(self.leftKeyTimer.timeout, self.leftTimerFire)
-
-        self.hideMediaPlayerInfoBar = eTimer()
-        self.hideMediaPlayerInfoBar_conn = eConnectCallback(self.hideMediaPlayerInfoBar.timeout, self.timerHideMediaPlayerInfoBar)
-
-        self.currList = "filelist"
-        self.isAudioCD = False
-        self.ext = None
-        self.AudioCD_albuminfo = {}
-        self.cdAudioTrackFiles = []
-        self.onShown.append(self.applySettings)
-
-        self.playlistIOInternal = PlaylistIOInternal()
-        list = self.playlistIOInternal.open(resolveFilename(SCOPE_CONFIG, "playlist.e2pls"))
-        if list:
-            for x in list:
-                self.playlist.addFile(x.ref)
-            self.playlist.updateList()
-
-        self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
-            {
-                iPlayableService.evUpdatedInfo: self.__evUpdatedInfo,
-                iPlayableService.evUser + 10: self.__evAudioDecodeError,
-                iPlayableService.evUser + 11: self.__evVideoDecodeError,
-                iPlayableService.evUser + 12: self.__evPluginError,
-                iPlayableService.evUser + 13: self["coverArt"].embeddedCoverArt
-            })
-        
-    def showServiceSummary(self):
-        lcdOnVideoPlayback = config.plugins.mediaplayer2.lcdOnVideoPlayback.value
-        if lcdOnVideoPlayback == "remaining":
-            self.summaries.showService(MediaPlayerLCDScreen.REMAINING_TIME_MODE)
-        elif lcdOnVideoPlayback == "position":
-            self.summaries.showService(MediaPlayerLCDScreen.POSITION_MODE)
-        else:
-            self.summaries.showText()
-
-    def hideServiceSummary(self):
-        self.summaries.showText()
-
-    def saveLastPositionIfEnabled(self):
-        if config.plugins.mediaplayer2.saveLastPosition.value:
-            self.saveLastPosition()
-
-    def audioSelection(self):
-        self.session.openWithCallback(self.audioSelected, MyAudioSelection, infobar=self)
-
-    def hideAndInfoBar(self):
-        self.hide()
-        self.mediaPlayerInfoBar.show()
-        if config.plugins.mediaplayer2.alwaysHideInfoBar.value or self.ext not in AUDIO_EXTENSIONS and not self.isAudioCD:
-            self.hideMediaPlayerInfoBar.start(5000, True)
-
-    def timerHideMediaPlayerInfoBar(self):
-        self.hideMediaPlayerInfoBar.stop()
-        self.mediaPlayerInfoBar.hide()
-
-    def subsDelayInc(self):
-        if not self.isSubsLoaded():
-            self.statusScreen.setStatus(_("No external subtitles loaded"))
-        else:
-            delay = self.getSubsDelay()
-            delay += 200
-            self.setSubsDelay(delay)
-            if delay > 0:
-                self.statusScreen.setStatus("+%d ms" % delay)
-            else:
-                self.statusScreen.setStatus("%d ms" % delay)
-
-    def subsDelayDec(self):
-        if not self.isSubsLoaded():
-            self.statusScreen.setStatus(_("No external subtitles loaded"))
-        else:
-            delay = self.getSubsDelay()
-            delay -= 200
-            self.setSubsDelay(delay)
-            if delay > 0:
-                self.statusScreen.setStatus("+%d ms" % delay)
-            else:
-                self.statusScreen.setStatus("%d ms" % delay)
-
-    def aspectChange(self):
-        if not self.shown:
-            super(MediaPlayer, self).toggleAVMode()
-            aspectStr = self.getAspectStr()
-            self.statusScreen.setStatus(aspectStr, "#00ff00")
-
-    def doNothing(self):
-        pass
-
-    def createSummary(self):
-        return MediaPlayerLCDScreen
-
-    def exit(self):
-        if self.mediaPlayerInfoBar.shown:
-            self.timerHideMediaPlayerInfoBar()
-            if config.plugins.mediaplayer2.hideInfobarAndClose.value:
-                self.session.openWithCallback(self.exitCallback, MessageBox, _("Exit media player?"))
-        else:
-            self.session.openWithCallback(self.exitCallback, MessageBox, _("Exit media player?"))
-
-    def exitCallback(self, answer):
-        if answer:
-            for f in self.onStopPlayback:
-                f()
-            self.playlistIOInternal.clear()
-            for x in self.playlist.list:
-                self.playlistIOInternal.addService(ServiceReference(x[0]))
-            if self.savePlaylistOnExit:
-                try:
-                    self.playlistIOInternal.save(resolveFilename(SCOPE_CONFIG, "playlist.e2pls"))
-                except IOError:
-                    print "couldn't save playlist.e2pls"
-            if config.plugins.mediaplayer2.saveDirOnExit.getValue():
-                config.plugins.mediaplayer2.defaultDir.setValue(self.filelist.getCurrentDirectory())
-                config.plugins.mediaplayer2.defaultDir.save()
-            try:
-                from Plugins.SystemPlugins.Hotplug.plugin import hotplugNotifier
-                hotplugNotifier.remove(self.hotplugCB)
-            except:
-                pass
-            del self["coverArt"].picload_conn
-            del self["coverArt"].picload
-            self.close()
-
-    def checkSkipShowHideLock(self):
-        self.updatedSeekState()
-
-    def doEofInternal(self, playing):
-        if playing:
-            self.removeLastPosition()
-            self.nextEntry()
-        else:
-            self.show()
-
-    def __onClose(self):
-        self.mediaPlayerInfoBar.doClose()
-        self.statusScreen.doClose()
-        self.session.nav.playService(self.oldService)
-
-    def __evUpdatedInfo(self):
-        currPlay = self.session.nav.getCurrentService()
-        sTagTrackNumber = currPlay.info().getInfo(iServiceInformation.sTagTrackNumber)
-        sTagTrackCount = currPlay.info().getInfo(iServiceInformation.sTagTrackCount)
-        sTagTitle = currPlay.info().getInfoString(iServiceInformation.sTagTitle)
-        print "[__evUpdatedInfo] title %d of %d (%s)" % (sTagTrackNumber, sTagTrackCount, sTagTitle)
-        self.readTitleInformation()
-
-    def __evAudioDecodeError(self):
-        currPlay = self.session.nav.getCurrentService()
-        sTagAudioCodec = currPlay.info().getInfoString(iServiceInformation.sTagAudioCodec)
-        print "[__evAudioDecodeError] audio-codec %s can't be decoded by hardware" % (sTagAudioCodec)
-        self.session.open(MessageBox, _("This receiver cannot decode %s streams!") % sTagAudioCodec, type=MessageBox.TYPE_INFO, timeout=20)
-
-    def __evVideoDecodeError(self):
-        currPlay = self.session.nav.getCurrentService()
-        sTagVideoCodec = currPlay.info().getInfoString(iServiceInformation.sTagVideoCodec)
-        print "[__evVideoDecodeError] video-codec %s can't be decoded by hardware" % (sTagVideoCodec)
-        self.session.open(MessageBox, _("This receiver cannot decode %s streams!") % sTagVideoCodec, type=MessageBox.TYPE_INFO, timeout=20)
-
-    def __evPluginError(self):
-        currPlay = self.session.nav.getCurrentService()
-        message = currPlay.info().getInfoString(iServiceInformation.sUser + 12)
-        print "[__evPluginError]" , message
-        self.session.open(MessageBox, message, type=MessageBox.TYPE_INFO, timeout=20)
-
-    def delMPTimer(self):
-        del self.rightKeyTimer_conn
-        del self.rightKeyTimer
-        del self.leftKeyTimer_conn
-        del self.leftKeyTimer
-        del self.hideMediaPlayerInfoBar_conn
-        del self.hideMediaPlayerInfoBar
-
-    def info(self):
-        if not self.shown:
-            if self.mediaPlayerInfoBar.shown:
-                self.mediaPlayerInfoBar.hide()
-                self.hideMediaPlayerInfoBar.stop()
-            else:
-                self.mediaPlayerInfoBar.show()
-            return
-
-        try:
-            from Plugins.Extensions.CSFD.plugin import CSFD
-            print "CSFD plugin import OK"
-        except ImportError:
-            print "CSFD not installed"
-            CSFD = None
-
-        movieName = None
-        if (self.currList == "filelist" or self.currList == 'playlist') and CSFD:
-            if self.currList == "filelist":
-                sel = self.filelist.getSelection()
-                if sel is not None:
-                    if sel[1]:
-                        path = sel[0]
-                        print path
-                        movieName = path.split('/')[-2]
-                    else:
-                        path = sel[0].getPath()
-                        print path
-                        movieName = os.path.splitext(os.path.split(path)[1])[0]
-            elif self.currList == 'playlist':
-                t = self.playlist.getSelection()
-                if t is None:
-                    return
-                movieName = self.getIdentifier(t)
-
-            if movieName is not None:
-                movieName = movieName.replace('.', ' ').replace('_', ' ').replace('-', ' ')
-                self.session.open(CSFD, movieName, False)
-
-    def readTitleInformation(self):
-        currPlay = self.session.nav.getCurrentService()
-        if currPlay is not None:
-            sTitle = currPlay.info().getInfoString(iServiceInformation.sTagTitle)
-            sAlbum = currPlay.info().getInfoString(iServiceInformation.sTagAlbum)
-            sGenre = currPlay.info().getInfoString(iServiceInformation.sTagGenre)
-            sArtist = currPlay.info().getInfoString(iServiceInformation.sTagArtist)
-            sYear = currPlay.info().getInfoString(iServiceInformation.sTagDate)
-
-            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()
-
-    def updateMusicInformation(self, artist="", title="", album="", year="", genre="", clear=False):
-        self.updateSingleMusicInformation("artist", artist, clear)
-        self.updateSingleMusicInformation("title", title, clear)
-        self.updateSingleMusicInformation("album", album, clear)
-        self.updateSingleMusicInformation("year", year, clear)
-        self.updateSingleMusicInformation("genre", genre, clear)
-
-    def updateSingleMusicInformation(self, name, info, clear):
-        if info != "" or clear:
-            if self[name].getText() != info:
-                self[name].setText(info)
-
-    def leftDown(self):
-        if not self.shown:
-            self.subsDelayDec()
-        else:
-            self.lefttimer = True
-            self.leftKeyTimer.start(1000)
-
-    def rightDown(self):
-        if not self.shown:
-            self.subsDelayInc()
-        else:
-            self.righttimer = True
-            self.rightKeyTimer.start(1000)
-
-    def leftUp(self):
-        if self.lefttimer and self.shown:
-            self.leftKeyTimer.stop()
-            self.lefttimer = False
-            self[self.currList].pageUp()
-            self.updateCurrentInfo()
-
-    def rightUp(self):
-        if self.righttimer and self.shown:
-            self.rightKeyTimer.stop()
-            self.righttimer = False
-            self[self.currList].pageDown()
-            self.updateCurrentInfo()
-
-    def leftTimerFire(self):
-        self.leftKeyTimer.stop()
-        self.lefttimer = False
-        self.switchToFileList()
-
-    def rightTimerFire(self):
-        self.rightKeyTimer.stop()
-        self.righttimer = False
-        self.switchToPlayList()
-
-    def switchLists(self):
-        if self.currList == "filelist":
-            self.switchToPlayList()
-            return
-        self.switchToFileList()
-
-    def switchToFileList(self):
-        self.currList = "filelist"
-        self.filelist.selectionEnabled(1)
-        self.playlist.selectionEnabled(0)
-        self.updateCurrentInfo()
-
-    def switchToPlayList(self):
-        if len(self.playlist) != 0:
-            self.currList = "playlist"
-            self.filelist.selectionEnabled(0)
-            self.playlist.selectionEnabled(1)
-            self.updateCurrentInfo()
-
-    def up(self):
-        self[self.currList].up()
-        self.updateCurrentInfo()
-
-    def down(self):
-        self[self.currList].down()
-        self.updateCurrentInfo()
-
-    def showAfterSeek(self):
-        if not self.shown:
-            self.hideAndInfoBar()
-
-    def showAfterCuesheetOperation(self):
-        self.hideAndInfoBar()
-
-    def hideAfterResume(self):
-        self.hideAndInfoBar()
-
-    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 = ""
-        if self.currList == "filelist":
-            idx = self.filelist.getSelectionIndex()
-            r = self.filelist.list[idx]
-            text = r[1][7]
-            if r[0][1] == True:
-                if len(text) < 2:
-                    text += " "
-                if text[:2] != "..":
-                    text = "/" + text
-            self.summaries.setText(text, 1)
-
-            idx += 1
-            if idx < len(self.filelist.list):
-                r = self.filelist.list[idx]
-                text = r[1][7]
-                if r[0][1] == True:
-                    text = "/" + text
-                self.summaries.setText(text, 3)
-            else:
-                self.summaries.setText(" ", 3)
-
-            idx += 1
-            if idx < len(self.filelist.list):
-                r = self.filelist.list[idx]
-                text = r[1][7]
-                if r[0][1] == True:
-                    text = "/" + text
-                self.summaries.setText(text, 4)
-            else:
-                self.summaries.setText(" ", 4)
-
-            text = ""
-            if not self.filelist.canDescent():
-                r = self.filelist.getServiceRef()
-                if r is None:
-                    return
-                text = r.getPath()
-                self["currenttext"].setText(os.path.basename(text))
-
-        if self.currList == "playlist":
-            t = self.playlist.getSelection()
-            if t is None:
-                return
-            # display current selected entry on LCD
-            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 = self.getIdentifier(currref)
-                self.summaries.setText(text, 3)
-            else:
-                self.summaries.setText(" ", 3)
-
-            idx += 1
-            if idx < len(self.playlist):
-                currref = self.playlist.getServiceRefList()[idx]
-                text = self.getIdentifier(currref)
-                self.summaries.setText(text, 4)
-            else:
-                self.summaries.setText(" ", 4)
-
-    def ok(self):
-        if not self.shown:
-            if self.mediaPlayerInfoBar.shown:
-                self.mediaPlayerInfoBar.hide()
-                self.hideMediaPlayerInfoBar.stop()
-                if self.ext in AUDIO_EXTENSIONS or self.isAudioCD:
-                    self.show()
-            else:
-                self.mediaPlayerInfoBar.show()
-            return
-
-        if self.currList == "filelist":
-            if self.filelist.canDescent():
-                self.filelist.descent()
-                self.updateCurrentInfo()
-            else:
-                self.copyFile()
-
-        if self.currList == "playlist":
-            if self.playlist.getCurrentIndex() == self.playlist.getSelectionIndex() and not self.playlist.isStopped():
-                if self.shown:
-                    self.hideAndInfoBar()
-                elif self.mediaPlayerInfoBar.shown:
-                    self.mediaPlayerInfoBar.hide()
-                    self.hideMediaPlayerInfoBar.stop()
-                    if self.ext in AUDIO_EXTENSIONS or self.isAudioCD:
-                        self.show()
-                else:
-                    self.mediaPlayerInfoBar.show()
-
-            else:
-                self.changeEntry(self.playlist.getSelectionIndex())
-
-    def showMenu(self):
-        menu = []
-        if len(self.cdAudioTrackFiles):
-            menu.insert(0, (_("Play audio-CD..."), "audiocd"))
-        if self.currList == "filelist":
-            if self.filelist.canDescent():
-                menu.append((_("Add directory to playlist"), "copydir"))
-                if config.plugins.mediaplayer2.contextMenuType.index >=2:
-                    menu.append((_("Add directory to playlist and play"), "copydirplay"))
-            else:
-                menu.append((_("Add files to playlist"), "copyfiles"))
-                if config.plugins.mediaplayer2.contextMenuType.index >=2:
-                    menu.append((_("Add files to playlist and play"), "copyfilesplay"))
-            menu.append((_("Switch to playlist"), "playlist"))
-            if config.plugins.mediaplayer2.contextMenuType.index >=1:  # intermediate+
-                menu.append((_("Delete file"), "deletefile"))
-        else:
-            playref = self.session.nav.getCurrentlyPlayingServiceReference()
-            curref = self.playlist.getServiceRefList()[self.playlist.getSelectionIndex()]
-            if curref and curref.type in (SERVICE_EPLAYER3, SERVICE_EXTEPLAYER3, SERVICE_GSTPLAYER, SERVICEMP3):
-                curtype = -1 # no type
-                if playref and playref.getPath() == curref.getPath():
-                    curtype = playref.type
-                if len(LIBMEDIA_CHOICES) > 1:
-                    choices = LIBMEDIA_CHOICES.copy()
-                    if curtype in choices.keys():
-                        del choices[curtype]
-                    defaulttype = self.libMedia
-                    if defaulttype in choices.keys():
-                        menu.append((_("Play with") + " " + choices[defaulttype], "playentry", defaulttype))
-                        del choices[defaulttype]
-                    for reftype in choices.keys():
-                        menu.append((_("Play with") + " " + choices[reftype], "playentry", reftype))
-            menu.append((_("Switch to filelist"), "filelist"))
-            menu.append((_("Clear playlist"), "clear"))
-            menu.append((_("Delete entry"), "deleteentry"))
-            if config.plugins.mediaplayer2.contextMenuType.index >=1:  # intermediate+
-                menu.append((_("Shuffle playlist"), "shuffle"))
-                menu.append((_("Show in filelist"), "showinfilelist"))
-        menu.append((_("Hide player"), "hide"));
-        menu.append((_("Load playlist"), "loadplaylist"));
-        if config.plugins.mediaplayer2.contextMenuType.index >=1:  # intermediate+
-            menu.append((_("Save playlist"), "saveplaylist"));
-            menu.append((_("Delete saved playlist"), "deleteplaylist"));
-        menu.append((_("Edit settings"), "settings"))
-        self.timerHideMediaPlayerInfoBar()
-        self.session.openWithCallback(self.menuCallback, ChoiceBox, title="", list=menu)
-
-    def menuCallback(self, choice):
-        self.show()
-        if choice is None:
-            return
-
-        if choice[1] == "copydir":
-            self.copyDirectory(self.filelist.getSelection()[0])
-        elif choice[1] == "copydirplay":
-            self.copyDirectory(self.filelist.getSelection()[0])
-            if len(self.playlist) > 0:
-                self.switchToPlayList()
-                self.changeEntry(0)
-        elif choice[1] == "copyfiles":
-            self.copyDirectory(os.path.dirname(self.filelist.getSelection()[0].getPath()) + "/", recursive=False)
-        elif choice[1] == "copyfilesplay":
-            self.copyDirectory(os.path.dirname(self.filelist.getSelection()[0].getPath()) + "/", recursive=False)
-            if len(self.playlist) > 0:
-                self.switchToPlayList()
-                self.changeEntry(0)
-        elif choice[1] == "playlist":
-            self.switchToPlayList()
-        elif choice[1] == "filelist":
-            self.switchToFileList()
-        elif choice[1] == "deleteentry":
-            if self.playlist.getSelectionIndex() == self.playlist.getCurrentIndex():
-                self.stopEntry()
-            self.deleteEntry()
-        elif choice[1] == "clear":
-            self.clear_playlist()
-        elif choice[1] == "hide":
-            self.hideAndInfoBar()
-        elif choice[1] == "saveplaylist":
-            self.save_playlist()
-        elif choice[1] == "loadplaylist":
-            self.load_playlist()
-        elif choice[1] == "deleteplaylist":
-            self.delete_saved_playlist()
-        elif choice[1] == "shuffle":
-            self.playlist.PlayListShuffle()
-        elif choice[1] == "deletefile":
-            self.deleteFile()
-        elif choice[1] == "settings":
-            self.session.openWithCallback(self.applySettings, MediaPlayerSettings, self)
-        elif choice[1] == "audiocd":
-            self.playAudioCD()
-        elif choice[1] == "playentry":
-            self.playlist.setCurrentPlaying(self.playlist.getSelectionIndex())
-            self.playEntry(choice[2])
-        elif choice[1] == "showinfilelist":
-            path = self.playlist.getCurrent().getPath()
-            if os.path.exists(path):
-                selection = None
-                dirname = os.path.dirname(path) + "/"
-                for p in [os.path.join(dirname, f) for f in os.listdir(dirname)]:
-                    if p == path:
-                        selection = p
-                        break
-                self.filelist.changeDir(dirname, selection)
-
-
-    def playAudioCD(self):
-        from enigma import eServiceReference
-        if len(self.cdAudioTrackFiles):
-            self.playlist.clear()
-            self.savePlaylistOnExit = False
-            self.isAudioCD = True
-            for file in self.cdAudioTrackFiles:
-                ref = eServiceReference(4097, 0, file)
-                self.playlist.addFile(ref)
-            try:
-                from Plugins.Extensions.CDInfo.plugin import Query
-                cdinfo = Query(self)
-                cdinfo.scan()
-            except ImportError:
-                pass  # we can live without CDInfo
-            self.changeEntry(0)
-            self.switchToPlayList()
-
-    def applySettings(self):
-        self.savePlaylistOnExit = config.plugins.mediaplayer2.savePlaylistOnExit.getValue()
-        if config.plugins.mediaplayer2.repeat.getValue() == True:
-            self["repeat"].setPixmapNum(1)
-        else:
-            self["repeat"].setPixmapNum(0)
-        if config.plugins.mediaplayer2.useLibMedia.getValue() == True:
-            self.libMedia = int(config.plugins.mediaplayer2.libMedia.getValue())
-        else:
-            self.libMedia = SERVICEMP3
-
-    def showEventInformation(self):
-        from Screens.EventView import EventViewSimple
-        from ServiceReference import ServiceReference
-        evt = self[self.currList].getCurrentEvent()
-        if evt:
-            self.session.open(EventViewSimple, evt, ServiceReference(self.getCurrent()))
-
-    # also works on filelist (?)
-    def getCurrent(self):
-        return self["playlist"].getCurrent()
-
-    def deletePlaylistEntry(self):
-        if self.currList == "playlist":
-            if self.playlist.getSelectionIndex() == self.playlist.getCurrentIndex():
-                self.stopEntry()
-            self.deleteEntry()
-
-    def skip_listbegin(self):
-        if self.currList == "filelist":
-            self.filelist.moveToIndex(0)
-        else:
-            self.playlist.moveToIndex(0)
-        self.updateCurrentInfo()
-
-    def skip_listend(self):
-        if self.currList == "filelist":
-            idx = len(self.filelist.list)
-            self.filelist.moveToIndex(idx - 1)
-        else:
-            self.playlist.moveToIndex(len(self.playlist) - 1)
-        self.updateCurrentInfo()
-
-    def save_playlist(self):
-        self.session.openWithCallback(self.save_playlist2, InputBox, title=_("Please enter filename (empty = use current date)"), windowTitle=_("Save playlist"), text=self.playlistname)
-
-    def save_playlist2(self, name):
-        if name is not None:
-            name = name.strip()
-            if name == "":
-                name = strftime("%y%m%d_%H%M%S")
-            self.playlistname = name
-            name += ".e2pls"
-            self.playlistIOInternal.clear()
-            for x in self.playlist.list:
-                self.playlistIOInternal.addService(ServiceReference(x[0]))
-            self.playlistIOInternal.save(resolveFilename(SCOPE_PLAYLIST) + name)
-
-    def load_playlist(self):
-        listpath = []
-        playlistdir = resolveFilename(SCOPE_PLAYLIST)
-        try:
-            for i in os.listdir(playlistdir):
-                listpath.append((i, playlistdir + i))
-        except IOError, e:
-            print "Error while scanning subdirs ", e
-        if config.plugins.mediaplayer2.sortPlaylists.value:
-            listpath.sort()
-        self.session.openWithCallback(self.PlaylistSelected, ChoiceBox, title=_("Please select a playlist..."), list=listpath)
-
-    def PlaylistSelected(self, path):
-        if path is not None:
-            self.playlistname = path[0].rsplit('.', 1)[-2]
-            self.clear_playlist()
-            extension = path[0].rsplit('.', 1)[-1]
-            if self.playlistparsers.has_key(extension):
-                playlist = self.playlistparsers[extension]()
-                list = playlist.open(path[1])
-                for x in list:
-                    self.playlist.addFile(x.ref)
-            self.playlist.updateList()
-
-    def delete_saved_playlist(self):
-        listpath = []
-        playlistdir = resolveFilename(SCOPE_PLAYLIST)
-        try:
-            for i in os.listdir(playlistdir):
-                listpath.append((i, playlistdir + i))
-        except IOError, e:
-            print "Error while scanning subdirs ", e
-        if config.plugins.mediaplayer2.sortPlaylists.value:
-            listpath.sort()
-        self.session.openWithCallback(self.DeletePlaylistSelected, ChoiceBox, title=_("Please select a playlist to delete..."), list=listpath)
-
-    def DeletePlaylistSelected(self, path):
-        if path is not None:
-            self.delname = path[1]
-            self.session.openWithCallback(self.deleteConfirmed, MessageBox, _("Do you really want to delete %s?") % (path[1]))
-
-    def deleteConfirmed(self, confirmed):
-        if confirmed:
-            try:
-                os.remove(self.delname)
-            except OSError, e:
-                print "delete failed:", e
-                self.session.open(MessageBox, _("Delete failed!"), MessageBox.TYPE_ERROR)
-
-    def clear_playlist(self):
-        self.isAudioCD = False
-        self.stopEntry()
-        self.playlist.clear()
-        self.switchToFileList()
-
-    def copyDirectory(self, directory, recursive=True):
-        print "copyDirectory", directory
-        if directory == '/':
-            print "refusing to operate on /"
-            return
-        filelist = FileList(directory, useServiceRef=True, showMountpoints=False, isTop=True)
-
-        for x in filelist.getFileList():
-            if x[0][1] == True:  # isDir
-                if recursive:
-                    if x[0][0] != directory:
-                        self.copyDirectory(x[0][0])
-            elif filelist.getServiceRef() and filelist.getServiceRef().type == 4097:
-                self.playlist.addFile(x[0][0])
-        self.playlist.updateList()
-
-    def deleteFile(self):
-        if self.currList == "filelist":
-            self.service = self.filelist.getServiceRef()
-        else:
-            self.service = self.playlist.getSelection()
-        if self.service is None:
-            return
-        if self.service.type != 4098 and self.session.nav.getCurrentlyPlayingServiceReference() is not None:
-            if self.service.getPath() == self.session.nav.getCurrentlyPlayingServiceReference().getPath():
-                self.stopEntry()
-
-        serviceHandler = eServiceCenter.getInstance()
-        offline = serviceHandler.offlineOperations(self.service)
-        info = serviceHandler.info(self.service)
-        name = info and info.getName(self.service)
-        result = False
-        if offline is not None:
-            # simulate first
-            if not offline.deleteFromDisk(1):
-                result = True
-        if result == True:
-            self.session.openWithCallback(self.deleteConfirmed_offline, MessageBox, _("Do you really want to delete %s?") % (name))
-        else:
-            self.session.openWithCallback(self.close, MessageBox, _("You cannot delete this!"), MessageBox.TYPE_ERROR)
-
-    def deleteConfirmed_offline(self, confirmed):
-        if confirmed:
-            serviceHandler = eServiceCenter.getInstance()
-            offline = serviceHandler.offlineOperations(self.service)
-            result = False
-            if offline is not None:
-                # really delete!
-                if not offline.deleteFromDisk(0):
-                    result = True
-            if result == False:
-                self.session.open(MessageBox, _("Delete failed!"), MessageBox.TYPE_ERROR)
-            else:
-                self.removeListEntry()
-
-    def removeListEntry(self):
-        currdir = self.filelist.getCurrentDirectory()
-        self.filelist.changeDir(currdir)
-        deleteend = False
-        while not deleteend:
-            index = 0
-            deleteend = True
-            if len(self.playlist) > 0:
-                for x in self.playlist.list:
-                    if self.service == x[0]:
-                        self.playlist.deleteFile(index)
-                        deleteend = False
-                        break
-                    index += 1
-        self.playlist.updateList()
-        if self.currList == "playlist":
-            if len(self.playlist) == 0:
-                self.switchToFileList()
-
-    def copyFile(self):
-        if self.filelist.getServiceRef().type == 4098:  # playlist
-            ServiceRef = self.filelist.getServiceRef()
-            extension = ServiceRef.getPath()[ServiceRef.getPath().rfind('.') + 1:]
-            if self.playlistparsers.has_key(extension):
-                playlist = self.playlistparsers[extension]()
-                list = playlist.open(ServiceRef.getPath())
-                for x in list:
-                    self.playlist.addFile(x.ref)
-            self.playlist.updateList()
-        else:
-            self.playlist.addFile(self.filelist.getServiceRef())
-            self.playlist.updateList()
-            if len(self.playlist) == 1:
-                self.changeEntry(0)
-
-    def addPlaylistParser(self, parser, extension):
-        self.playlistparsers[extension] = parser
-
-    def nextEntry(self):
-        next = self.playlist.getCurrentIndex() + 1
-        if next < len(self.playlist):
-            self.changeEntry(next)
-        elif (len(self.playlist) > 0) and (config.plugins.mediaplayer2.repeat.getValue() == True):
-            self.stopEntry()
-            self.changeEntry(0)
-        elif ( len(self.playlist) > 0 ):
-            self.stopEntry()
-
-    def nextMarkOrEntry(self):
-        if not self.jumpPreviousNextMark(lambda x: x):
-            next = self.playlist.getCurrentIndex() + 1
-            if next < len(self.playlist):
-                self.changeEntry(next)
-            else:
-                self.doSeek(-1)
-
-    def previousMarkOrEntry(self):
-        if not self.jumpPreviousNextMark(lambda x:-x - 5 * 90000, start=True):
-            next = self.playlist.getCurrentIndex() - 1
-            if next >= 0:
-                self.changeEntry(next)
-
-    def deleteEntry(self):
-        self.playlist.deleteFile(self.playlist.getSelectionIndex())
-        self.playlist.updateList()
-        if len(self.playlist) == 0:
-            self.switchToFileList()
-
-    def changeEntry(self, index):
-        self.playlist.setCurrentPlaying(index)
-        self.playEntry()
-
-    def playServiceRefEntry(self, serviceref):
-        serviceRefList = self.playlist.getServiceRefList()
-        for count in range(len(serviceRefList)):
-            if serviceRefList[count] == serviceref:
-                self.changeEntry(count)
-                break
-
-    def xplayEntry(self):
-        if self.currList == "playlist":
-            self.playEntry()
-        else:
-            self.stopEntry()
-            self.playlist.clear()
-            self.isAudioCD = False
-            sel = self.filelist.getSelection()
-            if sel:
-                if sel[1]:  # can descent
-                    # add directory to playlist
-                    self.copyDirectory(sel[0])
-                else:
-                    # add file to playlist
-                    self.copyFile()
-                    #self.copyDirectory(os.path.dirname(sel[0].getPath()) + "/", recursive=False)
-            if len(self.playlist) > 0:
-                self.changeEntry(0)
-
-    def playEntry(self, stype = None):
-        from enigma import eServiceReference
-        if len(self.playlist.getServiceRefList()):
-            needsInfoUpdate = False
-            currref = self.playlist.getServiceRefList()[self.playlist.getCurrentIndex()]
-            if stype is not None:
-                currref = eServiceReference(stype, 0, currref.getPath())
-            elif currref.type in (SERVICE_EPLAYER3, SERVICE_EXTEPLAYER3, SERVICE_GSTPLAYER, SERVICEMP3):
-                currref = eServiceReference(self.libMedia, 0, currref.getPath())
-            if self.session.nav.getCurrentlyPlayingServiceReference() is None or currref != self.session.nav.getCurrentlyPlayingServiceReference() or self.playlist.isStopped():
-                for f in self.onStartPlayback:
-                    f()
-                # reset subtitles and load external subtitles if available
-                self.resetSubs(True)
-                if os.path.isdir(os.path.dirname(currref.getPath())):
-                    subPath = os.path.splitext(currref.getPath())[0] + '.srt'
-                    if os.path.isfile(subPath):
-                        self.loadSubs(subPath)
-                if currref.type == SERVICE_GSTPLAYER:
-                    ServiceGstPlayerApplySettings()
-                self.session.nav.playService(currref)
-                info = eServiceCenter.getInstance().info(currref)
-                description = info and info.getInfoString(currref, iServiceInformation.sDescription) or ""
-                self["title"].setText(description)
-                # display just playing musik on LCD
-                idx = self.playlist.getCurrentIndex()
-                currref = self.playlist.getServiceRefList()[idx]
-                text = self.getIdentifier(currref)
-                self.ext = os.path.splitext(text)[1].lower()
-                text = ">" + text
-                # FIXME: the information if the service contains video (and we should hide our window) should com from the service instead
-                if self.ext not in AUDIO_EXTENSIONS and not self.isAudioCD:
-                    self.hideAndInfoBar()
-                else:
-                    needsInfoUpdate = True
-                self.summaries.setText(text, 1)
-
-                # get the next two entries
-                idx += 1
-                if idx < len(self.playlist):
-                    currref = self.playlist.getServiceRefList()[idx]
-                    text = self.getIdentifier(currref)
-                    self.summaries.setText(text, 3)
-                else:
-                    self.summaries.setText(" ", 3)
-
-                idx += 1
-                if idx < len(self.playlist):
-                    currref = self.playlist.getServiceRefList()[idx]
-                    text = self.getIdentifier(currref)
-                    self.summaries.setText(text, 4)
-                else:
-                    self.summaries.setText(" ", 4)
-            else:
-                idx = self.playlist.getCurrentIndex()
-                currref = self.playlist.getServiceRefList()[idx]
-                text = currref.getPath()
-                self.ext = os.path.splitext(text)[1].lower()
-                if self.ext not in AUDIO_EXTENSIONS and not self.isAudioCD:
-                    self.hideAndInfoBar()
-                else:
-                    needsInfoUpdate = True
-
-            self.unPauseService()
-            if needsInfoUpdate == True:
-                path = self.playlist.getServiceRefList()[self.playlist.getCurrentIndex()].getPath()
-                self["coverArt"].updateCoverArt(path)
-            else:
-                self["coverArt"].showDefaultCover()
-            self.readTitleInformation()
-
-    def updatedSeekState(self):
-        if self.seekstate == self.SEEK_STATE_PAUSE:
-            self.playlist.pauseFile()
-        elif self.seekstate == self.SEEK_STATE_PLAY:
-            self.playlist.playFile()
-        elif self.isStateForward(self.seekstate):
-            self.playlist.forwardFile()
-        elif self.isStateBackward(self.seekstate):
-            self.playlist.rewindFile()
-
-    def pauseEntry(self):
-        self.pauseService()
-        if self.seekstate == self.SEEK_STATE_PAUSE:
-            if self.ext in AUDIO_EXTENSIONS or self.isAudioCD:
-                self.show()
-        else:
-            self.hideAndInfoBar()
-
-    def stopEntry(self):
-        for f in self.onStopPlayback:
-            f()
-        self.playlist.stopFile()
-        self.session.nav.playService(None)
-        self.updateMusicInformation(clear=True)
-        self.show()
-        
-    def pauseService(self):
-        if self.seekstate == self.SEEK_STATE_PAUSE:
-            try:
-                on_pause = config.seek.on_pause.value
-            except Exception:
-                on_pause = "play"
-            if on_pause == "play":
-                self.unPauseService()
-            elif on_pause == "step":
-                self.doSeekRelative(1)
-            elif on_pause == "last":
-                self.setSeekState(self.lastseekstate)
-                self.lastseekstate = self.SEEK_STATE_PLAY
-        else:
-            if self.seekstate != self.SEEK_STATE_EOF:
-                self.lastseekstate = self.seekstate
-            self.setSeekState(self.SEEK_STATE_PAUSE)
-
-    def unPauseService(self):
-        self.setSeekState(self.SEEK_STATE_PLAY)
-
-    def subtitleSelection(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":
-                from Components.Scanner import scanDevice
-                devpath = harddiskmanager.getAutofsMountpoint(harddiskmanager.getCD())
-                self.cdAudioTrackFiles = []
-                res = scanDevice(devpath)
-                list = [ (r.description, r, res[r], self.session) for r in res ]
-                if list:
-                    (desc, scanner, files, session) = list[0]
-                    for file in files:
-                        if file.mimetype == "audio/x-cda":
-                            self.cdAudioTrackFiles.append(file.path)
-            else:
-                self.cdAudioTrackFiles = []
-                if self.isAudioCD:
-                    self.clear_playlist()
-
-class MediaPlayerLCDScreen(Screen):
-    POSITION_MODE = 1
-    REMAINING_TIME_MODE = 2
-
-    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 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)
-        self["text1"] = Label("Media player")
-        self.text1 = "Media player"
-        self["text3"] = Label("")
-        self.text3 = ""
-        self["text4"] = Label("")
-        self.text4 = ""
-        self.timer = eTimer()
-        self.timer_conn = eConnectCallback(self.timer.timeout, self.updateService)
-        self.mode = self.POSITION_MODE
-        self.serviceEnabled = False
-        self.onClose.append(self.__onClose)
-
-    def setText(self, text, line):
-        if len(text) > 10:
-            if text[-4:] == ".mp3":
-                text = text[:-4]
-        textleer = "    "
-        text = text + textleer * 10
-        if line == 1:
-            if self.serviceEnabled:
-                self.text1 = text
-            else:
-                self["text1"].setText(text)
-        elif line == 3:
-            if self.serviceEnabled:
-                self.text3 = text
-            else:
-                self["text3"].setText(text)
-        elif line == 4:
-            if self.serviceEnabled:
-                self.text4 = text
-            else:
-                self["text4"].setText(text)
-
-    def showText(self):
-        if self.serviceEnabled:
-            self.timer.stop()
-            self["text1"].setText(self.text1)
-            self["text3"].setText(self.text3)
-            self["text4"].setText(self.text4)
-            self.serviceEnabled = False
-
-    def showService(self, mode):
-        if not self.serviceEnabled:
-            self.mode = mode
-            self.text1 = self["text1"].getText()
-            self.text3 = self["text3"].getText()
-            self.text4 = self["text4"].getText()
-            self["text3"].setText("")
-            self["text4"].setText("")
-            self.serviceEnabled = True
-            self.timer.start(500)
-
-    def getSeek(self):
-        s = self.session.nav.getCurrentService()
-        return s and s.seek()
-
-    def getPosition(self):
-        seek = self.getSeek()
-        if seek is None:
-            return None
-        pos = seek.getPlayPosition()
-        if pos[0]:
-            return 0
-        return pos[1]
-
-    def getLength(self):
-        seek = self.getSeek()
-        if seek is None:
-            return None
-        length = seek.getLength()
-        if length[0]:
-            return 0
-        return length[1]
-
-    def updateService(self):
-        if self.mode == self.POSITION_MODE:
-            l = self.getPosition()
-            if l is not None:
-                l = l / 90000
-                self["text1"].setText("%d:%02d:%02d" % (l/3600, l%3600/60, l%60))
-        elif self.mode == self.REMAINING_TIME_MODE:
-            length = self.getLength()
-            position = self.getPosition()
-            if length is not None and position is not None:
-                l = length - position
-                l = l / 90000
-                self["text1"].setText("%d:%02d:%02d" % (l/3600, l%3600/60, l%60))
-
-    def __onClose(self):
-        del self.timer_conn
-        del self.timer
-
-def mainCheckTimeshiftCallback(session, answer):
-    if answer:
-        session.open(MediaPlayer)
-
-def main(session, **kwargs):
-    try:
-        InfoBar.instance.checkTimeshiftRunning(boundFunction(mainCheckTimeshiftCallback, session))
-    except Exception:
-        session.open(MediaPlayer)
-
-def menu(menuid, **kwargs):
-    if menuid == "mainmenu" and config.plugins.mediaplayer2.mainMenu.getValue():
-        return [(_("Media player"), main, "media_player2", 44)]
-    return []
-
-def filescan_open(list, session, **kwargs):
-    from enigma import eServiceReference
-
-    mp = session.open(MediaPlayer)
-    mp.playlist.clear()
-    mp.savePlaylistOnExit = False
-
-    for file in list:
-        if file.mimetype == "video/MP2T":
-            stype = 1
-        else:
-            stype = 4097
-        ref = eServiceReference(stype, 0, file.path)
-        mp.playlist.addFile(ref)
-
-    mp.changeEntry(0)
-    mp.switchToPlayList()
-
-def audioCD_open(list, session, **kwargs):
-    from enigma import eServiceReference
-
-    mp = session.open(MediaPlayer)
-    mp.cdAudioTrackFiles = [f.path for f in list]
-    mp.playAudioCD()
-
-def movielist_open(list, session, **kwargs):
-    if not list:
-        # sanity
-        return
-    from enigma import eServiceReference
-    from Screens.InfoBar import InfoBar
-    f = list[0]
-    if f.mimetype == "video/MP2T":
-        stype = 1
-    else:
-        stype = 4097
-    if InfoBar.instance:
-        path = os.path.split(f.path)[0]
-        if not path.endswith('/'):
-            path += '/'
-        config.movielist.last_videodir.value = path
-        InfoBar.instance.showMovies(eServiceReference(stype, 0, f.path))
-
-def filescan(**kwargs):
-    from Components.Scanner import Scanner, ScanPath
-    return [
-        Scanner(mimetypes=["video/mpeg", "video/MP2T", "video/x-msvideo", "video/mkv"],
-            paths_to_scan=
-                [
-                    ScanPath(path="", with_subdirs=False),
-                    ScanPath(path = "PRIVATE/AVCHD/BDMV/STREAM", with_subdirs = False),
-                ],
-            name="Movie",
-            description=_("Watch movies..."),
-            openfnc=movielist_open,
-        ),
-        Scanner(mimetypes=["video/x-vcd"],
-            paths_to_scan=
-                [
-                    ScanPath(path="mpegav", with_subdirs=False),
-                    ScanPath(path="MPEGAV", with_subdirs=False),
-                ],
-            name="Video CD",
-            description=_("View video CD..."),
-            openfnc=filescan_open,
-        ),
-        Scanner(mimetypes=["audio/mpeg", "audio/x-wav", "application/ogg", "audio/x-flac"],
-            paths_to_scan=
-                [
-                    ScanPath(path="", with_subdirs=False),
-                ],
-            name="Music",
-            description=_("Play music..."),
-            openfnc=filescan_open,
-        ),
-        Scanner(mimetypes=["audio/x-cda"],
-            paths_to_scan=
-                [
-                    ScanPath(path="", with_subdirs=False),
-                ],
-            name="Audio-CD",
-            description=_("Play audio-CD..."),
-            openfnc=audioCD_open,
-        ),
-        ]
-
-
-def Plugins(**kwargs):
-    name = 'MediaPlayer2'
-    description = _('Play back media files with subtitles')
-    pluginList = []
-    pluginList.append(PluginDescriptor(name, PluginDescriptor.WHERE_PLUGINMENU, description, fnc=main))
-    if config.plugins.mediaplayer2.extensionsMenu.value:
-        pluginList.append(PluginDescriptor(name, PluginDescriptor.WHERE_EXTENSIONSMENU, description, fnc=main))
-    if config.plugins.mediaplayer2.mainMenu.value:
-        pluginList.append(PluginDescriptor(name, PluginDescriptor.WHERE_MENU, description, fnc=menu))
-    return pluginList
+import os
+import random
+from time import strftime
+import traceback
+
+from Components.AVSwitch import AVSwitch
+from Components.ActionMap import ActionMap, HelpableActionMap
+from Components.FileList import FileList
+from Components.Harddisk import harddiskmanager
+from Components.Label import Label
+from Components.MediaPlayer import PlayList, STATE_STOP, STATE_NONE
+from Components.Pixmap import Pixmap, MultiPixmap
+from Components.Playlist import PlaylistIOInternal, PlaylistIOM3U, PlaylistIOPLS
+from Components.PluginComponent import plugins
+from Components.ServiceEventTracker import ServiceEventTracker, InfoBarBase
+from Components.ServicePosition import ServicePositionGauge
+from Components.config import config
+from Plugins.Plugin import PluginDescriptor
+from Screens.ChoiceBox import ChoiceBox
+from Screens.HelpMenu import HelpableScreen
+from Screens.InfoBarGenerics import InfoBarSeek, InfoBarAudioSelection, InfoBarNotifications, InfoBarExtensions, InfoBarPlugins
+from Screens.InputBox import InputBox
+from Screens.MessageBox import MessageBox
+from Screens.Screen import Screen
+from Tools.BoundFunction import boundFunction
+from Tools.Directories import fileExists, resolveFilename, \
+    SCOPE_CONFIG, SCOPE_PLAYLIST, SCOPE_CURRENT_SKIN
+
+from ServiceReference import ServiceReference
+from .e2util import (
+    InfoBarAspectChange,
+    StatusScreen,
+    MyAudioSelection,
+    MyInfoBarCueSheetSupport,
+)
+
+from .compat import eConnectCallback
+from enigma import iPlayableService, eTimer, eServiceCenter, iServiceInformation, \
+    ePicLoad, getDesktop
+from .settings import MediaPlayerSettings, LIBMEDIA_CHOICES, SERVICEMP3, SERVICE_GSTPLAYER, SERVICE_EXTEPLAYER3, SERVICE_EPLAYER3, ServiceGstPlayerApplySettings
+from skin import parseColor
+
+from . import _
+
+
+# init subtitles support
+try:
+    from Plugins.Extensions.SubsSupport import SubsSupport, SubsSupportStatus, initSubsSettings
+except ImportError as e:
+    traceback.print_exc()
+    raise Exception("Please install SubsSupport plugin")
+
+
+try:
+    from Components.MovieList import AUDIO_EXTENSIONS
+except ImportError:
+    AUDIO_EXTENSIONS = frozenset((".mp2", ".mp3", ".wav", ".ogg", ".flac", ".m4a"))
+
+
+class MyPlayList(PlayList):
+    def __init__(self):
+        PlayList.__init__(self)
+        self.state = STATE_NONE
+
+    def updateState(self, state):
+        self.state = state
+        PlayList.updateState(self, state)
+
+    def isStopped(self):
+        return self.state in (STATE_STOP, STATE_NONE)
+
+    def PlayListShuffle(self):
+        random.shuffle(self.list)
+        self.l.setList(self.list)
+        self.currPlaying = -1
+        self.oldCurrPlaying = -1
+
+class MediaPixmap(Pixmap):
+    def __init__(self):
+        Pixmap.__init__(self)
+        self.coverArtFileName = ""
+        self.picload = ePicLoad()
+        self.picload_conn = eConnectCallback(self.picload.PictureData, self.paintCoverArtPixmapCB)
+        self.coverFileNames = ["folder.png", "folder.jpg"]
+
+    def applySkin(self, desktop, screen):
+        from Tools.LoadPixmap import LoadPixmap
+        noCoverFile = None
+        if self.skinAttributes is not None:
+            for (attrib, value) in self.skinAttributes:
+                if attrib == "pixmap":
+                    noCoverFile = value
+                    break
+        if noCoverFile is None:
+            noCoverFile = resolveFilename(SCOPE_CURRENT_SKIN, "skin_default/no_coverArt.png")
+        self.noCoverPixmap = LoadPixmap(noCoverFile)
+        return Pixmap.applySkin(self, desktop, screen)
+
+    def onShow(self):
+        Pixmap.onShow(self)
+        sc = AVSwitch().getFramebufferScale()
+        # 0=Width 1=Height 2=Aspect 3=use_cache 4=resize_type 5=Background(#AARRGGBB)
+        self.picload.setPara((self.instance.size().width(), self.instance.size().height(), sc[0], sc[1], False, 1, "#00000000"))
+
+    def paintCoverArtPixmapCB(self, picInfo=None):
+        ptr = self.picload.getData()
+        if ptr != None:
+            self.instance.setPixmap(ptr.__deref__())
+
+    def updateCoverArt(self, path):
+        while not path.endswith("/"):
+            path = path[:-1]
+        new_coverArtFileName = None
+        for filename in self.coverFileNames:
+            if fileExists(path + filename):
+                new_coverArtFileName = path + filename
+        if self.coverArtFileName != new_coverArtFileName:
+            self.coverArtFileName = new_coverArtFileName
+            if new_coverArtFileName:
+                self.picload.startDecode(self.coverArtFileName)
+            else:
+                self.showDefaultCover()
+
+    def showDefaultCover(self):
+        self.instance.setPixmap(self.noCoverPixmap)
+
+    def embeddedCoverArt(self):
+        print("[embeddedCoverArt] found")
+        self.coverArtFileName = "/tmp/.id3coverart"
+        self.picload.startDecode(self.coverArtFileName)
+
+class MediaPlayerInfoBar(Screen):
+
+    def __init__(self, session):
+        Screen.__init__(self, session)
+        self.skinName = "MoviePlayer"
+
+
+class MediaPlayer(Screen, InfoBarBase, SubsSupportStatus, SubsSupport, InfoBarSeek, InfoBarAudioSelection, MyInfoBarCueSheetSupport, InfoBarExtensions, InfoBarPlugins, InfoBarNotifications, InfoBarPlugins):
+    ALLOW_SUSPEND = True
+    ENABLE_RESUME_SUPPORT = True
+
+    def __init__(self, session, args=None):
+        Screen.__init__(self, session)
+        InfoBarAudioSelection.__init__(self)
+        InfoBarBase.__init__(self, steal_current_service=True)
+        InfoBarExtensions.__init__(self)
+        InfoBarPlugins.__init__(self)
+        InfoBarNotifications.__init__(self)
+        # for external subtitles
+        initSubsSettings()
+        SubsSupport.__init__(self, embeddedSupport=True, searchSupport=True)
+        SubsSupportStatus.__init__(self)
+        InfoBarAspectChange.__init__(self)
+        HelpableScreen.__init__(self)
+        self.summary = None
+        self.title = "MediaPlayer2"
+        self.oldService = self.session.nav.getCurrentlyPlayingServiceReference()
+        self.session.nav.stopService()
+
+        self.playlistparsers = {}
+        self.addPlaylistParser(PlaylistIOM3U, "m3u")
+        self.addPlaylistParser(PlaylistIOPLS, "pls")
+        self.addPlaylistParser(PlaylistIOInternal, "e2pls")
+
+        # 'None' is magic to start at the list of mountpoints
+        defaultDir = config.plugins.mediaplayer2.defaultDir.getValue()
+        self.filelist = FileList(defaultDir, matchingPattern="(?i)^.*\.(mp2|mp3|ogg|ts|mts|m2ts|wav|wave|m3u|pls|e2pls|mpg|vob|avi|divx|m4v|mkv|mp4|m4a|dat|flac|flv|mov|dts|3gp|3g2|asf|wmv|wma|is)", useServiceRef=True, showMountpoints=True)
+        self["filelist"] = self.filelist
+        
+        if config.plugins.mediaplayer2.useLibMedia.getValue() == True:
+            self.libMedia = int(config.plugins.mediaplayer2.libMedia.getValue())
+        else:
+            self.libMedia = SERVICEMP3
+
+        self.playlist = MyPlayList()
+        self.is_closing = False
+        self.delname = ""
+        self.playlistname = ""
+        self["playlist"] = self.playlist
+
+        self["PositionGauge"] = ServicePositionGauge(self.session.nav)
+
+        self["currenttext"] = Label("")
+
+        self["artisttext"] = Label(_("Artist") + ':')
+        self["artist"] = Label("")
+        self["titletext"] = Label(_("Title") + ':')
+        self["title"] = Label("")
+        self["albumtext"] = Label(_("Album") + ':')
+        self["album"] = Label("")
+        self["yeartext"] = Label(_("Year") + ':')
+        self["year"] = Label("")
+        self["genretext"] = Label(_("Genre") + ':')
+        self["genre"] = Label("")
+        self["coverArt"] = MediaPixmap()
+        self["repeat"] = MultiPixmap()
+
+        self.seek_target = None
+
+        try:
+            from Plugins.SystemPlugins.Hotplug.plugin import hotplugNotifier
+            hotplugNotifier.append(self.hotplugCB)
+        except Exception as ex:
+            print("[MediaPlayer] No hotplug support", ex)
+
+        class MoviePlayerActionMap(ActionMap):
+            def __init__(self, player, contexts=[ ], actions={ }, prio=0):
+                ActionMap.__init__(self, contexts, actions, prio)
+                self.player = player
+
+            def action(self, contexts, action):
+                self.player.show()
+                return ActionMap.action(self, contexts, action)
+
+        self["OkCancelActions"] = HelpableActionMap(self, "OkCancelActions",
+            {
+                "ok": (self.ok, _("Add file to playlist")),
+                "cancel": (self.exit, _("Exit mediaplayer")),
+            }, -2)
+
+        self["MediaPlayerActions"] = HelpableActionMap(self, "MediaPlayer2Actions",
+            {
+                "info": (self.info, _("show info")),
+                "play": (self.xplayEntry, _("Play entry")),
+                "pause": (self.pauseEntry, _("Pause")),
+                "stop": (self.stopEntry, _("Stop entry")),
+                "previous": (self.previousMarkOrEntry, _("Play from previous mark or playlist entry")),
+                "next": (self.nextMarkOrEntry, _("Play from next mark or playlist entry")),
+                "menu": (self.showMenu, _("Menu")),
+                "skipListbegin": (self.skip_listbegin, _("Jump to beginning of list")),
+                "skipListend": (self.skip_listend, _("Jump to end of list")),
+                "prevBouquet": (self.switchLists, _("Switch to playlist")),
+                "nextBouquet": (self.switchLists, _("Switch to filelist")),
+                "delete": (self.deletePlaylistEntry, _("Delete playlist entry")),
+                "shift_stop": (self.clear_playlist, _("Clear playlist")),
+                "shift_record": (self.playlist.PlayListShuffle, _("Shuffle playlist")),
+                "subsStatus":(self.subsStatus, _("Show external subtitles status"))
+            }, -2)
+
+        self["InfobarEPGActions"] = HelpableActionMap(self, "InfobarEPGActions",
+            {
+                "showEventInfo": (self.showEventInformation, _("show event details")),
+            })
+
+        self["RLActions"] = ActionMap(["RightLeftActions"],
+        {
+            "right": self.rightDown,
+            "rightRepeated": self.doNothing,
+            "rightUp": self.rightUp,
+            "left": self.leftDown,
+            "leftRepeated": self.doNothing,
+            "leftUp": self.leftUp,
+        }, -2)
+
+        self["actions"] = MoviePlayerActionMap(self, ["UpDownActions"],
+        {
+            "up": self.up,
+            "upRepeated": self.up,
+            "upUp": self.doNothing,
+            "down": self.down,
+            "downRepeated": self.down,
+            "downUp": self.doNothing,
+        }, -2)
+
+        InfoBarSeek.__init__(self, actionmap="MediaPlayer2SeekActions")
+
+        self.mediaPlayerInfoBar = self.session.instantiateDialog(MediaPlayerInfoBar)
+        self.statusScreen = self.session.instantiateDialog(StatusScreen)
+        mpGaugeRenderer = self.getGaugeRenderer(self.mediaPlayerInfoBar.renderer)
+        gaugeRenderers = mpGaugeRenderer and [mpGaugeRenderer] or []
+        cueSheetForServicemp3 = config.plugins.mediaplayer2.cueSheetForServicemp3.value
+        MyInfoBarCueSheetSupport.__init__(self, "MediaPlayerCueSheetActions", "mp2cuesheet", gaugeRenderers, cueSheetForServicemp3)
+
+        self.onStopPlayback = [self.saveLastPositionIfEnabled]
+        self.onStartPlayback = [self.saveLastPositionIfEnabled]
+
+        self.onClose.append(self.delMPTimer)
+        self.onClose.append(self.__onClose)
+        self.onHide.append(self.showServiceSummary)
+        self.onShow.append(self.hideServiceSummary)
+        self.onShow.append(self.timerHideMediaPlayerInfoBar)
+
+        self.righttimer = False
+        self.rightKeyTimer = eTimer()
+        self.rightKeyTimer_conn = eConnectCallback(self.rightKeyTimer.timeout, self.rightTimerFire)
+
+        self.lefttimer = False
+        self.leftKeyTimer = eTimer()
+        self.leftKeyTimer_conn = eConnectCallback(self.leftKeyTimer.timeout, self.leftTimerFire)
+
+        self.hideMediaPlayerInfoBar = eTimer()
+        self.hideMediaPlayerInfoBar_conn = eConnectCallback(self.hideMediaPlayerInfoBar.timeout, self.timerHideMediaPlayerInfoBar)
+
+        self.currList = "filelist"
+        self.isAudioCD = False
+        self.ext = None
+        self.AudioCD_albuminfo = {}
+        self.cdAudioTrackFiles = []
+        self.onShown.append(self.applySettings)
+
+        self.playlistIOInternal = PlaylistIOInternal()
+        list = self.playlistIOInternal.open(resolveFilename(SCOPE_CONFIG, "playlist.e2pls"))
+        if list:
+            for x in list:
+                self.playlist.addFile(x.ref)
+            self.playlist.updateList()
+
+        self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
+            {
+                iPlayableService.evUpdatedInfo: self.__evUpdatedInfo,
+                iPlayableService.evUser + 10: self.__evAudioDecodeError,
+                iPlayableService.evUser + 11: self.__evVideoDecodeError,
+                iPlayableService.evUser + 12: self.__evPluginError,
+                iPlayableService.evUser + 13: self["coverArt"].embeddedCoverArt
+            })
+        
+    def showServiceSummary(self):
+        lcdOnVideoPlayback = config.plugins.mediaplayer2.lcdOnVideoPlayback.value
+        if lcdOnVideoPlayback == "remaining":
+            self.summaries.showService(MediaPlayerLCDScreen.REMAINING_TIME_MODE)
+        elif lcdOnVideoPlayback == "position":
+            self.summaries.showService(MediaPlayerLCDScreen.POSITION_MODE)
+        else:
+            self.summaries.showText()
+
+    def hideServiceSummary(self):
+        self.summaries.showText()
+
+    def saveLastPositionIfEnabled(self):
+        if config.plugins.mediaplayer2.saveLastPosition.value:
+            self.saveLastPosition()
+
+    def audioSelection(self):
+        self.session.openWithCallback(self.audioSelected, MyAudioSelection, infobar=self)
+
+    def hideAndInfoBar(self):
+        self.hide()
+        self.mediaPlayerInfoBar.show()
+        if config.plugins.mediaplayer2.alwaysHideInfoBar.value or self.ext not in AUDIO_EXTENSIONS and not self.isAudioCD:
+            self.hideMediaPlayerInfoBar.start(5000, True)
+
+    def timerHideMediaPlayerInfoBar(self):
+        self.hideMediaPlayerInfoBar.stop()
+        self.mediaPlayerInfoBar.hide()
+
+    def subsDelayInc(self):
+        if not self.isSubsLoaded():
+            self.statusScreen.setStatus(_("No external subtitles loaded"))
+        else:
+            delay = self.getSubsDelay()
+            delay += 200
+            self.setSubsDelay(delay)
+            if delay > 0:
+                self.statusScreen.setStatus("+%d ms" % delay)
+            else:
+                self.statusScreen.setStatus("%d ms" % delay)
+
+    def subsDelayDec(self):
+        if not self.isSubsLoaded():
+            self.statusScreen.setStatus(_("No external subtitles loaded"))
+        else:
+            delay = self.getSubsDelay()
+            delay -= 200
+            self.setSubsDelay(delay)
+            if delay > 0:
+                self.statusScreen.setStatus("+%d ms" % delay)
+            else:
+                self.statusScreen.setStatus("%d ms" % delay)
+
+    def aspectChange(self):
+        if not self.shown:
+            super(MediaPlayer, self).toggleAVMode()
+            aspectStr = self.getAspectStr()
+            self.statusScreen.setStatus(aspectStr, "#00ff00")
+
+    def doNothing(self):
+        pass
+
+    def createSummary(self):
+        return MediaPlayerLCDScreen
+
+    def exit(self):
+        if self.mediaPlayerInfoBar.shown:
+            self.timerHideMediaPlayerInfoBar()
+            if config.plugins.mediaplayer2.hideInfobarAndClose.value:
+                self.session.openWithCallback(self.exitCallback, MessageBox, _("Exit media player?"))
+        else:
+            self.session.openWithCallback(self.exitCallback, MessageBox, _("Exit media player?"))
+
+    def exitCallback(self, answer):
+        if answer:
+            for f in self.onStopPlayback:
+                f()
+            self.playlistIOInternal.clear()
+            for x in self.playlist.list:
+                self.playlistIOInternal.addService(ServiceReference(x[0]))
+            if self.savePlaylistOnExit:
+                try:
+                    self.playlistIOInternal.save(resolveFilename(SCOPE_CONFIG, "playlist.e2pls"))
+                except IOError:
+                    print("couldn't save playlist.e2pls")
+            if config.plugins.mediaplayer2.saveDirOnExit.getValue():
+                config.plugins.mediaplayer2.defaultDir.setValue(self.filelist.getCurrentDirectory())
+                config.plugins.mediaplayer2.defaultDir.save()
+            try:
+                from Plugins.SystemPlugins.Hotplug.plugin import hotplugNotifier
+                hotplugNotifier.remove(self.hotplugCB)
+            except:
+                pass
+            del self["coverArt"].picload_conn
+            del self["coverArt"].picload
+            self.close()
+
+    def checkSkipShowHideLock(self):
+        self.updatedSeekState()
+
+    def doEofInternal(self, playing):
+        if playing:
+            self.removeLastPosition()
+            self.nextEntry()
+        else:
+            self.show()
+
+    def __onClose(self):
+        self.mediaPlayerInfoBar.doClose()
+        self.statusScreen.doClose()
+        self.session.nav.playService(self.oldService)
+
+    def __evUpdatedInfo(self):
+        currPlay = self.session.nav.getCurrentService()
+        sTagTrackNumber = currPlay.info().getInfo(iServiceInformation.sTagTrackNumber)
+        sTagTrackCount = currPlay.info().getInfo(iServiceInformation.sTagTrackCount)
+        sTagTitle = currPlay.info().getInfoString(iServiceInformation.sTagTitle)
+        print("[__evUpdatedInfo] title %d of %d (%s)" % (sTagTrackNumber, sTagTrackCount, sTagTitle))
+        self.readTitleInformation()
+
+    def __evAudioDecodeError(self):
+        currPlay = self.session.nav.getCurrentService()
+        sTagAudioCodec = currPlay.info().getInfoString(iServiceInformation.sTagAudioCodec)
+        print("[__evAudioDecodeError] audio-codec %s can't be decoded by hardware" % (sTagAudioCodec))
+        self.session.open(MessageBox, _("This receiver cannot decode %s streams!") % sTagAudioCodec, type=MessageBox.TYPE_INFO, timeout=20)
+
+    def __evVideoDecodeError(self):
+        currPlay = self.session.nav.getCurrentService()
+        sTagVideoCodec = currPlay.info().getInfoString(iServiceInformation.sTagVideoCodec)
+        print("[__evVideoDecodeError] video-codec %s can't be decoded by hardware" % (sTagVideoCodec))
+        self.session.open(MessageBox, _("This receiver cannot decode %s streams!") % sTagVideoCodec, type=MessageBox.TYPE_INFO, timeout=20)
+
+    def __evPluginError(self):
+        currPlay = self.session.nav.getCurrentService()
+        message = currPlay.info().getInfoString(iServiceInformation.sUser + 12)
+        print("[__evPluginError]", message)
+        self.session.open(MessageBox, message, type=MessageBox.TYPE_INFO, timeout=20)
+
+    def delMPTimer(self):
+        del self.rightKeyTimer_conn
+        del self.rightKeyTimer
+        del self.leftKeyTimer_conn
+        del self.leftKeyTimer
+        del self.hideMediaPlayerInfoBar_conn
+        del self.hideMediaPlayerInfoBar
+
+    def info(self):
+        if not self.shown:
+            if self.mediaPlayerInfoBar.shown:
+                self.mediaPlayerInfoBar.hide()
+                self.hideMediaPlayerInfoBar.stop()
+            else:
+                self.mediaPlayerInfoBar.show()
+            return
+
+        try:
+            from Plugins.Extensions.CSFD.plugin import CSFD
+            print("CSFD plugin import OK")
+        except ImportError:
+            print("CSFD not installed")
+            CSFD = None
+
+        movieName = None
+        if (self.currList == "filelist" or self.currList == 'playlist') and CSFD:
+            if self.currList == "filelist":
+                sel = self.filelist.getSelection()
+                if sel is not None:
+                    if sel[1]:
+                        path = sel[0]
+                        print(path)
+                        movieName = path.split('/')[-2]
+                    else:
+                        path = sel[0].getPath()
+                        print(path)
+                        movieName = os.path.splitext(os.path.split(path)[1])[0]
+            elif self.currList == 'playlist':
+                t = self.playlist.getSelection()
+                if t is None:
+                    return
+                movieName = self.getIdentifier(t)
+
+            if movieName is not None:
+                movieName = movieName.replace('.', ' ').replace('_', ' ').replace('-', ' ')
+                self.session.open(CSFD, movieName, False)
+
+    def readTitleInformation(self):
+        currPlay = self.session.nav.getCurrentService()
+        if currPlay is not None:
+            sTitle = currPlay.info().getInfoString(iServiceInformation.sTagTitle)
+            sAlbum = currPlay.info().getInfoString(iServiceInformation.sTagAlbum)
+            sGenre = currPlay.info().getInfoString(iServiceInformation.sTagGenre)
+            sArtist = currPlay.info().getInfoString(iServiceInformation.sTagArtist)
+            sYear = currPlay.info().getInfoString(iServiceInformation.sTagDate)
+
+            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()
+
+    def updateMusicInformation(self, artist="", title="", album="", year="", genre="", clear=False):
+        self.updateSingleMusicInformation("artist", artist, clear)
+        self.updateSingleMusicInformation("title", title, clear)
+        self.updateSingleMusicInformation("album", album, clear)
+        self.updateSingleMusicInformation("year", year, clear)
+        self.updateSingleMusicInformation("genre", genre, clear)
+
+    def updateSingleMusicInformation(self, name, info, clear):
+        if info != "" or clear:
+            if self[name].getText() != info:
+                self[name].setText(info)
+
+    def leftDown(self):
+        if not self.shown:
+            self.subsDelayDec()
+        else:
+            self.lefttimer = True
+            self.leftKeyTimer.start(1000)
+
+    def rightDown(self):
+        if not self.shown:
+            self.subsDelayInc()
+        else:
+            self.righttimer = True
+            self.rightKeyTimer.start(1000)
+
+    def leftUp(self):
+        if self.lefttimer and self.shown:
+            self.leftKeyTimer.stop()
+            self.lefttimer = False
+            self[self.currList].pageUp()
+            self.updateCurrentInfo()
+
+    def rightUp(self):
+        if self.righttimer and self.shown:
+            self.rightKeyTimer.stop()
+            self.righttimer = False
+            self[self.currList].pageDown()
+            self.updateCurrentInfo()
+
+    def leftTimerFire(self):
+        self.leftKeyTimer.stop()
+        self.lefttimer = False
+        self.switchToFileList()
+
+    def rightTimerFire(self):
+        self.rightKeyTimer.stop()
+        self.righttimer = False
+        self.switchToPlayList()
+
+    def switchLists(self):
+        if self.currList == "filelist":
+            self.switchToPlayList()
+            return
+        self.switchToFileList()
+
+    def switchToFileList(self):
+        self.currList = "filelist"
+        self.filelist.selectionEnabled(1)
+        self.playlist.selectionEnabled(0)
+        self.updateCurrentInfo()
+
+    def switchToPlayList(self):
+        if len(self.playlist) != 0:
+            self.currList = "playlist"
+            self.filelist.selectionEnabled(0)
+            self.playlist.selectionEnabled(1)
+            self.updateCurrentInfo()
+
+    def up(self):
+        self[self.currList].up()
+        self.updateCurrentInfo()
+
+    def down(self):
+        self[self.currList].down()
+        self.updateCurrentInfo()
+
+    def showAfterSeek(self):
+        if not self.shown:
+            self.hideAndInfoBar()
+
+    def showAfterCuesheetOperation(self):
+        self.hideAndInfoBar()
+
+    def hideAfterResume(self):
+        self.hideAndInfoBar()
+
+    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 = ""
+        if self.currList == "filelist":
+            idx = self.filelist.getSelectionIndex()
+            r = self.filelist.list[idx]
+            text = r[1][7]
+            if r[0][1] == True:
+                if len(text) < 2:
+                    text += " "
+                if text[:2] != "..":
+                    text = "/" + text
+            self.summaries.setText(text, 1)
+
+            idx += 1
+            if idx < len(self.filelist.list):
+                r = self.filelist.list[idx]
+                text = r[1][7]
+                if r[0][1] == True:
+                    text = "/" + text
+                self.summaries.setText(text, 3)
+            else:
+                self.summaries.setText(" ", 3)
+
+            idx += 1
+            if idx < len(self.filelist.list):
+                r = self.filelist.list[idx]
+                text = r[1][7]
+                if r[0][1] == True:
+                    text = "/" + text
+                self.summaries.setText(text, 4)
+            else:
+                self.summaries.setText(" ", 4)
+
+            text = ""
+            if not self.filelist.canDescent():
+                r = self.filelist.getServiceRef()
+                if r is None:
+                    return
+                text = r.getPath()
+                self["currenttext"].setText(os.path.basename(text))
+
+        if self.currList == "playlist":
+            t = self.playlist.getSelection()
+            if t is None:
+                return
+            # display current selected entry on LCD
+            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 = self.getIdentifier(currref)
+                self.summaries.setText(text, 3)
+            else:
+                self.summaries.setText(" ", 3)
+
+            idx += 1
+            if idx < len(self.playlist):
+                currref = self.playlist.getServiceRefList()[idx]
+                text = self.getIdentifier(currref)
+                self.summaries.setText(text, 4)
+            else:
+                self.summaries.setText(" ", 4)
+
+    def ok(self):
+        if not self.shown:
+            if self.mediaPlayerInfoBar.shown:
+                self.mediaPlayerInfoBar.hide()
+                self.hideMediaPlayerInfoBar.stop()
+                if self.ext in AUDIO_EXTENSIONS or self.isAudioCD:
+                    self.show()
+            else:
+                self.mediaPlayerInfoBar.show()
+            return
+
+        if self.currList == "filelist":
+            if self.filelist.canDescent():
+                self.filelist.descent()
+                self.updateCurrentInfo()
+            else:
+                self.copyFile()
+
+        if self.currList == "playlist":
+            if self.playlist.getCurrentIndex() == self.playlist.getSelectionIndex() and not self.playlist.isStopped():
+                if self.shown:
+                    self.hideAndInfoBar()
+                elif self.mediaPlayerInfoBar.shown:
+                    self.mediaPlayerInfoBar.hide()
+                    self.hideMediaPlayerInfoBar.stop()
+                    if self.ext in AUDIO_EXTENSIONS or self.isAudioCD:
+                        self.show()
+                else:
+                    self.mediaPlayerInfoBar.show()
+
+            else:
+                self.changeEntry(self.playlist.getSelectionIndex())
+
+    def showMenu(self):
+        menu = []
+        if len(self.cdAudioTrackFiles):
+            menu.insert(0, (_("Play audio-CD..."), "audiocd"))
+        if self.currList == "filelist":
+            if self.filelist.canDescent():
+                menu.append((_("Add directory to playlist"), "copydir"))
+                if config.plugins.mediaplayer2.contextMenuType.index >=2:
+                    menu.append((_("Add directory to playlist and play"), "copydirplay"))
+            else:
+                menu.append((_("Add files to playlist"), "copyfiles"))
+                if config.plugins.mediaplayer2.contextMenuType.index >=2:
+                    menu.append((_("Add files to playlist and play"), "copyfilesplay"))
+            menu.append((_("Switch to playlist"), "playlist"))
+            if config.plugins.mediaplayer2.contextMenuType.index >=1:  # intermediate+
+                menu.append((_("Delete file"), "deletefile"))
+        else:
+            playref = self.session.nav.getCurrentlyPlayingServiceReference()
+            curref = self.playlist.getServiceRefList()[self.playlist.getSelectionIndex()]
+            if curref and curref.type in (SERVICE_EPLAYER3, SERVICE_EXTEPLAYER3, SERVICE_GSTPLAYER, SERVICEMP3):
+                curtype = -1 # no type
+                if playref and playref.getPath() == curref.getPath():
+                    curtype = playref.type
+                if len(LIBMEDIA_CHOICES) > 1:
+                    choices = LIBMEDIA_CHOICES.copy()
+                    if curtype in choices.keys():
+                        del choices[curtype]
+                    defaulttype = self.libMedia
+                    if defaulttype in choices.keys():
+                        menu.append((_("Play with") + " " + choices[defaulttype], "playentry", defaulttype))
+                        del choices[defaulttype]
+                    for reftype in choices.keys():
+                        menu.append((_("Play with") + " " + choices[reftype], "playentry", reftype))
+            menu.append((_("Switch to filelist"), "filelist"))
+            menu.append((_("Clear playlist"), "clear"))
+            menu.append((_("Delete entry"), "deleteentry"))
+            if config.plugins.mediaplayer2.contextMenuType.index >=1:  # intermediate+
+                menu.append((_("Shuffle playlist"), "shuffle"))
+                menu.append((_("Show in filelist"), "showinfilelist"))
+        menu.append((_("Hide player"), "hide"));
+        menu.append((_("Load playlist"), "loadplaylist"));
+        if config.plugins.mediaplayer2.contextMenuType.index >=1:  # intermediate+
+            menu.append((_("Save playlist"), "saveplaylist"));
+            menu.append((_("Delete saved playlist"), "deleteplaylist"));
+        menu.append((_("Edit settings"), "settings"))
+        self.timerHideMediaPlayerInfoBar()
+        self.session.openWithCallback(self.menuCallback, ChoiceBox, title="", list=menu)
+
+    def menuCallback(self, choice):
+        self.show()
+        if choice is None:
+            return
+
+        if choice[1] == "copydir":
+            self.copyDirectory(self.filelist.getSelection()[0])
+        elif choice[1] == "copydirplay":
+            self.copyDirectory(self.filelist.getSelection()[0])
+            if len(self.playlist) > 0:
+                self.switchToPlayList()
+                self.changeEntry(0)
+        elif choice[1] == "copyfiles":
+            self.copyDirectory(os.path.dirname(self.filelist.getSelection()[0].getPath()) + "/", recursive=False)
+        elif choice[1] == "copyfilesplay":
+            self.copyDirectory(os.path.dirname(self.filelist.getSelection()[0].getPath()) + "/", recursive=False)
+            if len(self.playlist) > 0:
+                self.switchToPlayList()
+                self.changeEntry(0)
+        elif choice[1] == "playlist":
+            self.switchToPlayList()
+        elif choice[1] == "filelist":
+            self.switchToFileList()
+        elif choice[1] == "deleteentry":
+            if self.playlist.getSelectionIndex() == self.playlist.getCurrentIndex():
+                self.stopEntry()
+            self.deleteEntry()
+        elif choice[1] == "clear":
+            self.clear_playlist()
+        elif choice[1] == "hide":
+            self.hideAndInfoBar()
+        elif choice[1] == "saveplaylist":
+            self.save_playlist()
+        elif choice[1] == "loadplaylist":
+            self.load_playlist()
+        elif choice[1] == "deleteplaylist":
+            self.delete_saved_playlist()
+        elif choice[1] == "shuffle":
+            self.playlist.PlayListShuffle()
+        elif choice[1] == "deletefile":
+            self.deleteFile()
+        elif choice[1] == "settings":
+            self.session.openWithCallback(self.applySettings, MediaPlayerSettings, self)
+        elif choice[1] == "audiocd":
+            self.playAudioCD()
+        elif choice[1] == "playentry":
+            self.playlist.setCurrentPlaying(self.playlist.getSelectionIndex())
+            self.playEntry(choice[2])
+        elif choice[1] == "showinfilelist":
+            path = self.playlist.getCurrent().getPath()
+            if os.path.exists(path):
+                selection = None
+                dirname = os.path.dirname(path) + "/"
+                for p in [os.path.join(dirname, f) for f in os.listdir(dirname)]:
+                    if p == path:
+                        selection = p
+                        break
+                self.filelist.changeDir(dirname, selection)
+
+
+    def playAudioCD(self):
+        from enigma import eServiceReference
+        if len(self.cdAudioTrackFiles):
+            self.playlist.clear()
+            self.savePlaylistOnExit = False
+            self.isAudioCD = True
+            for file in self.cdAudioTrackFiles:
+                ref = eServiceReference(4097, 0, file)
+                self.playlist.addFile(ref)
+            try:
+                from Plugins.Extensions.CDInfo.plugin import Query
+                cdinfo = Query(self)
+                cdinfo.scan()
+            except ImportError:
+                pass  # we can live without CDInfo
+            self.changeEntry(0)
+            self.switchToPlayList()
+
+    def applySettings(self):
+        self.savePlaylistOnExit = config.plugins.mediaplayer2.savePlaylistOnExit.getValue()
+        if config.plugins.mediaplayer2.repeat.getValue() == True:
+            self["repeat"].setPixmapNum(1)
+        else:
+            self["repeat"].setPixmapNum(0)
+        if config.plugins.mediaplayer2.useLibMedia.getValue() == True:
+            self.libMedia = int(config.plugins.mediaplayer2.libMedia.getValue())
+        else:
+            self.libMedia = SERVICEMP3
+
+    def showEventInformation(self):
+        from Screens.EventView import EventViewSimple
+        from ServiceReference import ServiceReference
+        evt = self[self.currList].getCurrentEvent()
+        if evt:
+            self.session.open(EventViewSimple, evt, ServiceReference(self.getCurrent()))
+
+    # also works on filelist (?)
+    def getCurrent(self):
+        return self["playlist"].getCurrent()
+
+    def deletePlaylistEntry(self):
+        if self.currList == "playlist":
+            if self.playlist.getSelectionIndex() == self.playlist.getCurrentIndex():
+                self.stopEntry()
+            self.deleteEntry()
+
+    def skip_listbegin(self):
+        if self.currList == "filelist":
+            self.filelist.moveToIndex(0)
+        else:
+            self.playlist.moveToIndex(0)
+        self.updateCurrentInfo()
+
+    def skip_listend(self):
+        if self.currList == "filelist":
+            idx = len(self.filelist.list)
+            self.filelist.moveToIndex(idx - 1)
+        else:
+            self.playlist.moveToIndex(len(self.playlist) - 1)
+        self.updateCurrentInfo()
+
+    def save_playlist(self):
+        self.session.openWithCallback(self.save_playlist2, InputBox, title=_("Please enter filename (empty = use current date)"), windowTitle=_("Save playlist"), text=self.playlistname)
+
+    def save_playlist2(self, name):
+        if name is not None:
+            name = name.strip()
+            if name == "":
+                name = strftime("%y%m%d_%H%M%S")
+            self.playlistname = name
+            name += ".e2pls"
+            self.playlistIOInternal.clear()
+            for x in self.playlist.list:
+                self.playlistIOInternal.addService(ServiceReference(x[0]))
+            self.playlistIOInternal.save(resolveFilename(SCOPE_PLAYLIST) + name)
+
+    def load_playlist(self):
+        listpath = []
+        playlistdir = resolveFilename(SCOPE_PLAYLIST)
+        try:
+            for i in os.listdir(playlistdir):
+                listpath.append((i, playlistdir + i))
+        except IOError as e:
+            print("Error while scanning subdirs", e)
+        if config.plugins.mediaplayer2.sortPlaylists.value:
+            listpath.sort()
+        self.session.openWithCallback(self.PlaylistSelected, ChoiceBox, title=_("Please select a playlist..."), list=listpath)
+
+    def PlaylistSelected(self, path):
+        if path is not None:
+            self.playlistname = path[0].rsplit('.', 1)[-2]
+            self.clear_playlist()
+            extension = path[0].rsplit('.', 1)[-1]
+            if extension in self.playlistparsers:
+                playlist = self.playlistparsers[extension]()
+                list = playlist.open(path[1])
+                for x in list:
+                    self.playlist.addFile(x.ref)
+            self.playlist.updateList()
+
+    def delete_saved_playlist(self):
+        listpath = []
+        playlistdir = resolveFilename(SCOPE_PLAYLIST)
+        try:
+            for i in os.listdir(playlistdir):
+                listpath.append((i, playlistdir + i))
+        except IOError as e:
+            print("Error while scanning subdirs", e)
+        if config.plugins.mediaplayer2.sortPlaylists.value:
+            listpath.sort()
+        self.session.openWithCallback(self.DeletePlaylistSelected, ChoiceBox, title=_("Please select a playlist to delete..."), list=listpath)
+
+    def DeletePlaylistSelected(self, path):
+        if path is not None:
+            self.delname = path[1]
+            self.session.openWithCallback(self.deleteConfirmed, MessageBox, _("Do you really want to delete %s?") % (path[1]))
+
+    def deleteConfirmed(self, confirmed):
+        if confirmed:
+            try:
+                os.remove(self.delname)
+            except OSError as e:
+                print("delete failed:", e)
+                self.session.open(MessageBox, _("Delete failed!"), MessageBox.TYPE_ERROR)
+
+    def clear_playlist(self):
+        self.isAudioCD = False
+        self.stopEntry()
+        self.playlist.clear()
+        self.switchToFileList()
+
+    def copyDirectory(self, directory, recursive=True):
+        print("copyDirectory", directory)
+        if directory == '/':
+            print("refusing to operate on /")
+            return
+        filelist = FileList(directory, useServiceRef=True, showMountpoints=False, isTop=True)
+
+        for x in filelist.getFileList():
+            if x[0][1] == True:  # isDir
+                if recursive:
+                    if x[0][0] != directory:
+                        self.copyDirectory(x[0][0])
+            elif filelist.getServiceRef() and filelist.getServiceRef().type == 4097:
+                self.playlist.addFile(x[0][0])
+        self.playlist.updateList()
+
+    def deleteFile(self):
+        if self.currList == "filelist":
+            self.service = self.filelist.getServiceRef()
+        else:
+            self.service = self.playlist.getSelection()
+        if self.service is None:
+            return
+        if self.service.type != 4098 and self.session.nav.getCurrentlyPlayingServiceReference() is not None:
+            if self.service.getPath() == self.session.nav.getCurrentlyPlayingServiceReference().getPath():
+                self.stopEntry()
+
+        serviceHandler = eServiceCenter.getInstance()
+        offline = serviceHandler.offlineOperations(self.service)
+        info = serviceHandler.info(self.service)
+        name = info and info.getName(self.service)
+        result = False
+        if offline is not None:
+            # simulate first
+            if not offline.deleteFromDisk(1):
+                result = True
+        if result == True:
+            self.session.openWithCallback(self.deleteConfirmed_offline, MessageBox, _("Do you really want to delete %s?") % (name))
+        else:
+            self.session.openWithCallback(self.close, MessageBox, _("You cannot delete this!"), MessageBox.TYPE_ERROR)
+
+    def deleteConfirmed_offline(self, confirmed):
+        if confirmed:
+            serviceHandler = eServiceCenter.getInstance()
+            offline = serviceHandler.offlineOperations(self.service)
+            result = False
+            if offline is not None:
+                # really delete!
+                if not offline.deleteFromDisk(0):
+                    result = True
+            if result == False:
+                self.session.open(MessageBox, _("Delete failed!"), MessageBox.TYPE_ERROR)
+            else:
+                self.removeListEntry()
+
+    def removeListEntry(self):
+        currdir = self.filelist.getCurrentDirectory()
+        self.filelist.changeDir(currdir)
+        deleteend = False
+        while not deleteend:
+            index = 0
+            deleteend = True
+            if len(self.playlist) > 0:
+                for x in self.playlist.list:
+                    if self.service == x[0]:
+                        self.playlist.deleteFile(index)
+                        deleteend = False
+                        break
+                    index += 1
+        self.playlist.updateList()
+        if self.currList == "playlist":
+            if len(self.playlist) == 0:
+                self.switchToFileList()
+
+    def copyFile(self):
+        if self.filelist.getServiceRef().type == 4098:  # playlist
+            ServiceRef = self.filelist.getServiceRef()
+            extension = ServiceRef.getPath()[ServiceRef.getPath().rfind('.') + 1:]
+            if extension in self.playlistparsers:
+                playlist = self.playlistparsers[extension]()
+                list = playlist.open(ServiceRef.getPath())
+                for x in list:
+                    self.playlist.addFile(x.ref)
+            self.playlist.updateList()
+        else:
+            self.playlist.addFile(self.filelist.getServiceRef())
+            self.playlist.updateList()
+            if len(self.playlist) == 1:
+                self.changeEntry(0)
+
+    def addPlaylistParser(self, parser, extension):
+        self.playlistparsers[extension] = parser
+
+    def nextEntry(self):
+        next = self.playlist.getCurrentIndex() + 1
+        if next < len(self.playlist):
+            self.changeEntry(next)
+        elif (len(self.playlist) > 0) and (config.plugins.mediaplayer2.repeat.getValue() == True):
+            self.stopEntry()
+            self.changeEntry(0)
+        elif ( len(self.playlist) > 0 ):
+            self.stopEntry()
+
+    def nextMarkOrEntry(self):
+        if not self.jumpPreviousNextMark(lambda x: x):
+            next = self.playlist.getCurrentIndex() + 1
+            if next < len(self.playlist):
+                self.changeEntry(next)
+            else:
+                self.doSeek(-1)
+
+    def previousMarkOrEntry(self):
+        if not self.jumpPreviousNextMark(lambda x:-x - 5 * 90000, start=True):
+            next = self.playlist.getCurrentIndex() - 1
+            if next >= 0:
+                self.changeEntry(next)
+
+    def deleteEntry(self):
+        self.playlist.deleteFile(self.playlist.getSelectionIndex())
+        self.playlist.updateList()
+        if len(self.playlist) == 0:
+            self.switchToFileList()
+
+    def changeEntry(self, index):
+        self.playlist.setCurrentPlaying(index)
+        self.playEntry()
+
+    def playServiceRefEntry(self, serviceref):
+        serviceRefList = self.playlist.getServiceRefList()
+        for count in range(len(serviceRefList)):
+            if serviceRefList[count] == serviceref:
+                self.changeEntry(count)
+                break
+
+    def xplayEntry(self):
+        if self.currList == "playlist":
+            self.playEntry()
+        else:
+            self.stopEntry()
+            self.playlist.clear()
+            self.isAudioCD = False
+            sel = self.filelist.getSelection()
+            if sel:
+                if sel[1]:  # can descent
+                    # add directory to playlist
+                    self.copyDirectory(sel[0])
+                else:
+                    # add file to playlist
+                    self.copyFile()
+                    #self.copyDirectory(os.path.dirname(sel[0].getPath()) + "/", recursive=False)
+            if len(self.playlist) > 0:
+                self.changeEntry(0)
+
+    def playEntry(self, stype = None):
+        from enigma import eServiceReference
+        if len(self.playlist.getServiceRefList()):
+            needsInfoUpdate = False
+            currref = self.playlist.getServiceRefList()[self.playlist.getCurrentIndex()]
+            if stype is not None:
+                currref = eServiceReference(stype, 0, currref.getPath())
+            elif currref.type in (SERVICE_EPLAYER3, SERVICE_EXTEPLAYER3, SERVICE_GSTPLAYER, SERVICEMP3):
+                currref = eServiceReference(self.libMedia, 0, currref.getPath())
+            if self.session.nav.getCurrentlyPlayingServiceReference() is None or currref != self.session.nav.getCurrentlyPlayingServiceReference() or self.playlist.isStopped():
+                for f in self.onStartPlayback:
+                    f()
+                # reset subtitles and load external subtitles if available
+                self.resetSubs(True)
+                if os.path.isdir(os.path.dirname(currref.getPath())):
+                    subPath = os.path.splitext(currref.getPath())[0] + '.srt'
+                    if os.path.isfile(subPath):
+                        self.loadSubs(subPath)
+                if currref.type == SERVICE_GSTPLAYER:
+                    ServiceGstPlayerApplySettings()
+                self.session.nav.playService(currref)
+                info = eServiceCenter.getInstance().info(currref)
+                description = info and info.getInfoString(currref, iServiceInformation.sDescription) or ""
+                self["title"].setText(description)
+                # display just playing musik on LCD
+                idx = self.playlist.getCurrentIndex()
+                currref = self.playlist.getServiceRefList()[idx]
+                text = self.getIdentifier(currref)
+                self.ext = os.path.splitext(text)[1].lower()
+                text = ">" + text
+                # FIXME: the information if the service contains video (and we should hide our window) should com from the service instead
+                if self.ext not in AUDIO_EXTENSIONS and not self.isAudioCD:
+                    self.hideAndInfoBar()
+                else:
+                    needsInfoUpdate = True
+                self.summaries.setText(text, 1)
+
+                # get the next two entries
+                idx += 1
+                if idx < len(self.playlist):
+                    currref = self.playlist.getServiceRefList()[idx]
+                    text = self.getIdentifier(currref)
+                    self.summaries.setText(text, 3)
+                else:
+                    self.summaries.setText(" ", 3)
+
+                idx += 1
+                if idx < len(self.playlist):
+                    currref = self.playlist.getServiceRefList()[idx]
+                    text = self.getIdentifier(currref)
+                    self.summaries.setText(text, 4)
+                else:
+                    self.summaries.setText(" ", 4)
+            else:
+                idx = self.playlist.getCurrentIndex()
+                currref = self.playlist.getServiceRefList()[idx]
+                text = currref.getPath()
+                self.ext = os.path.splitext(text)[1].lower()
+                if self.ext not in AUDIO_EXTENSIONS and not self.isAudioCD:
+                    self.hideAndInfoBar()
+                else:
+                    needsInfoUpdate = True
+
+            self.unPauseService()
+            if needsInfoUpdate == True:
+                path = self.playlist.getServiceRefList()[self.playlist.getCurrentIndex()].getPath()
+                self["coverArt"].updateCoverArt(path)
+            else:
+                self["coverArt"].showDefaultCover()
+            self.readTitleInformation()
+
+    def updatedSeekState(self):
+        if self.seekstate == self.SEEK_STATE_PAUSE:
+            self.playlist.pauseFile()
+        elif self.seekstate == self.SEEK_STATE_PLAY:
+            self.playlist.playFile()
+        elif self.isStateForward(self.seekstate):
+            self.playlist.forwardFile()
+        elif self.isStateBackward(self.seekstate):
+            self.playlist.rewindFile()
+
+    def pauseEntry(self):
+        self.pauseService()
+        if self.seekstate == self.SEEK_STATE_PAUSE:
+            if self.ext in AUDIO_EXTENSIONS or self.isAudioCD:
+                self.show()
+        else:
+            self.hideAndInfoBar()
+
+    def stopEntry(self):
+        for f in self.onStopPlayback:
+            f()
+        self.playlist.stopFile()
+        self.session.nav.playService(None)
+        self.updateMusicInformation(clear=True)
+        self.show()
+        
+    def pauseService(self):
+        if self.seekstate == self.SEEK_STATE_PAUSE:
+            try:
+                on_pause = config.seek.on_pause.value
+            except Exception:
+                on_pause = "play"
+            if on_pause == "play":
+                self.unPauseService()
+            elif on_pause == "step":
+                self.doSeekRelative(1)
+            elif on_pause == "last":
+                self.setSeekState(self.lastseekstate)
+                self.lastseekstate = self.SEEK_STATE_PLAY
+        else:
+            if self.seekstate != self.SEEK_STATE_EOF:
+                self.lastseekstate = self.seekstate
+            self.setSeekState(self.SEEK_STATE_PAUSE)
+
+    def unPauseService(self):
+        self.setSeekState(self.SEEK_STATE_PLAY)
+
+    def subtitleSelection(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":
+                from Components.Scanner import scanDevice
+                devpath = harddiskmanager.getAutofsMountpoint(harddiskmanager.getCD())
+                self.cdAudioTrackFiles = []
+                res = scanDevice(devpath)
+                list = [ (r.description, r, res[r], self.session) for r in res ]
+                if list:
+                    (desc, scanner, files, session) = list[0]
+                    for file in files:
+                        if file.mimetype == "audio/x-cda":
+                            self.cdAudioTrackFiles.append(file.path)
+            else:
+                self.cdAudioTrackFiles = []
+                if self.isAudioCD:
+                    self.clear_playlist()
+
+class MediaPlayerLCDScreen(Screen):
+    POSITION_MODE = 1
+    REMAINING_TIME_MODE = 2
+
+    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 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)
+        self["text1"] = Label("Media player")
+        self.text1 = "Media player"
+        self["text3"] = Label("")
+        self.text3 = ""
+        self["text4"] = Label("")
+        self.text4 = ""
+        self.timer = eTimer()
+        self.timer_conn = eConnectCallback(self.timer.timeout, self.updateService)
+        self.mode = self.POSITION_MODE
+        self.serviceEnabled = False
+        self.onClose.append(self.__onClose)
+
+    def setText(self, text, line):
+        if len(text) > 10:
+            if text[-4:] == ".mp3":
+                text = text[:-4]
+        textleer = "    "
+        text = text + textleer * 10
+        if line == 1:
+            if self.serviceEnabled:
+                self.text1 = text
+            else:
+                self["text1"].setText(text)
+        elif line == 3:
+            if self.serviceEnabled:
+                self.text3 = text
+            else:
+                self["text3"].setText(text)
+        elif line == 4:
+            if self.serviceEnabled:
+                self.text4 = text
+            else:
+                self["text4"].setText(text)
+
+    def showText(self):
+        if self.serviceEnabled:
+            self.timer.stop()
+            self["text1"].setText(self.text1)
+            self["text3"].setText(self.text3)
+            self["text4"].setText(self.text4)
+            self.serviceEnabled = False
+
+    def showService(self, mode):
+        if not self.serviceEnabled:
+            self.mode = mode
+            self.text1 = self["text1"].getText()
+            self.text3 = self["text3"].getText()
+            self.text4 = self["text4"].getText()
+            self["text3"].setText("")
+            self["text4"].setText("")
+            self.serviceEnabled = True
+            self.timer.start(500)
+
+    def getSeek(self):
+        s = self.session.nav.getCurrentService()
+        return s and s.seek()
+
+    def getPosition(self):
+        seek = self.getSeek()
+        if seek is None:
+            return None
+        pos = seek.getPlayPosition()
+        if pos[0]:
+            return 0
+        return pos[1]
+
+    def getLength(self):
+        seek = self.getSeek()
+        if seek is None:
+            return None
+        length = seek.getLength()
+        if length[0]:
+            return 0
+        return length[1]
+
+    def updateService(self):
+        if self.mode == self.POSITION_MODE:
+            l = self.getPosition()
+            if l is not None:
+                l = l // 90000
+                self["text1"].setText("%d:%02d:%02d" % (l//3600, l%3600//60, l%60))
+        elif self.mode == self.REMAINING_TIME_MODE:
+            length = self.getLength()
+            position = self.getPosition()
+            if length is not None and position is not None:
+                l = length - position
+                l = l // 90000
+                self["text1"].setText("%d:%02d:%02d" % (l//3600, l%3600//60, l%60))
+
+    def __onClose(self):
+        del self.timer_conn
+        del self.timer
+
+def mainCheckTimeshiftCallback(session, answer):
+    if answer:
+        session.open(MediaPlayer)
+
+def main(session, **kwargs):
+    try:
+        InfoBar.instance.checkTimeshiftRunning(boundFunction(mainCheckTimeshiftCallback, session))
+    except Exception:
+        session.open(MediaPlayer)
+
+def menu(menuid, **kwargs):
+    if menuid == "mainmenu" and config.plugins.mediaplayer2.mainMenu.getValue():
+        return [(_("Media player"), main, "media_player2", 44)]
+    return []
+
+def filescan_open(list, session, **kwargs):
+    from enigma import eServiceReference
+
+    mp = session.open(MediaPlayer)
+    mp.playlist.clear()
+    mp.savePlaylistOnExit = False
+
+    for file in list:
+        if file.mimetype == "video/MP2T":
+            stype = 1
+        else:
+            stype = 4097
+        ref = eServiceReference(stype, 0, file.path)
+        mp.playlist.addFile(ref)
+
+    mp.changeEntry(0)
+    mp.switchToPlayList()
+
+def audioCD_open(list, session, **kwargs):
+    from enigma import eServiceReference
+
+    mp = session.open(MediaPlayer)
+    mp.cdAudioTrackFiles = [f.path for f in list]
+    mp.playAudioCD()
+
+def movielist_open(list, session, **kwargs):
+    if not list:
+        # sanity
+        return
+    from enigma import eServiceReference
+    from Screens.InfoBar import InfoBar
+    f = list[0]
+    if f.mimetype == "video/MP2T":
+        stype = 1
+    else:
+        stype = 4097
+    if InfoBar.instance:
+        path = os.path.split(f.path)[0]
+        if not path.endswith('/'):
+            path += '/'
+        config.movielist.last_videodir.value = path
+        InfoBar.instance.showMovies(eServiceReference(stype, 0, f.path))
+
+def filescan(**kwargs):
+    from Components.Scanner import Scanner, ScanPath
+    return [
+        Scanner(mimetypes=["video/mpeg", "video/MP2T", "video/x-msvideo", "video/mkv"],
+            paths_to_scan=
+                [
+                    ScanPath(path="", with_subdirs=False),
+                    ScanPath(path = "PRIVATE/AVCHD/BDMV/STREAM", with_subdirs = False),
+                ],
+            name="Movie",
+            description=_("Watch movies..."),
+            openfnc=movielist_open,
+        ),
+        Scanner(mimetypes=["video/x-vcd"],
+            paths_to_scan=
+                [
+                    ScanPath(path="mpegav", with_subdirs=False),
+                    ScanPath(path="MPEGAV", with_subdirs=False),
+                ],
+            name="Video CD",
+            description=_("View video CD..."),
+            openfnc=filescan_open,
+        ),
+        Scanner(mimetypes=["audio/mpeg", "audio/x-wav", "application/ogg", "audio/x-flac"],
+            paths_to_scan=
+                [
+                    ScanPath(path="", with_subdirs=False),
+                ],
+            name="Music",
+            description=_("Play music..."),
+            openfnc=filescan_open,
+        ),
+        Scanner(mimetypes=["audio/x-cda"],
+            paths_to_scan=
+                [
+                    ScanPath(path="", with_subdirs=False),
+                ],
+            name="Audio-CD",
+            description=_("Play audio-CD..."),
+            openfnc=audioCD_open,
+        ),
+        ]
+
+
+def Plugins(**kwargs):
+    name = 'MediaPlayer2'
+    description = _('Play back media files with subtitles')
+    pluginList = []
+    pluginList.append(PluginDescriptor(name, PluginDescriptor.WHERE_PLUGINMENU, description, fnc=main))
+    if config.plugins.mediaplayer2.extensionsMenu.value:
+        pluginList.append(PluginDescriptor(name, PluginDescriptor.WHERE_EXTENSIONSMENU, description, fnc=main))
+    if config.plugins.mediaplayer2.mainMenu.value:
+        pluginList.append(PluginDescriptor(name, PluginDescriptor.WHERE_MENU, description, fnc=menu))
+    return pluginList