diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2009-04-19 23:33:44 +0200 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2009-04-19 23:33:44 +0200 |
| commit | e8f443313e47e0653d61d23c90352572194e5608 (patch) | |
| tree | 7188d3ea5a8c91066fe1dfd5f7241eeb3e3c5226 /lib/python/Plugins/Extensions/DVDPlayer/plugin.py | |
| parent | 2d7f4e102ee3231bdb600b0ac7e2d8f898034b78 (diff) | |
| parent | 0d076f400e8740e55289427c0f19c8055c74bbc5 (diff) | |
| download | enigma2-e8f443313e47e0653d61d23c90352572194e5608.tar.gz enigma2-e8f443313e47e0653d61d23c90352572194e5608.zip | |
Merge branch 'master' of /home/tmbinc/enigma2-git
Diffstat (limited to 'lib/python/Plugins/Extensions/DVDPlayer/plugin.py')
| -rw-r--r-- | lib/python/Plugins/Extensions/DVDPlayer/plugin.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py index ebcf4f81..e77b8940 100644 --- a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py +++ b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py @@ -14,7 +14,6 @@ from Components.ServiceEventTracker import ServiceEventTracker, InfoBarBase from Components.config import config from Tools.Directories import pathExists, fileExists from Components.Harddisk import harddiskmanager -from Plugins.SystemPlugins.Hotplug.plugin import hotplugNotifier import servicedvd # load c++ part of dvd player plugin @@ -346,6 +345,8 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP }) self.onClose.append(self.__onClose) + + from Plugins.SystemPlugins.Hotplug.plugin import hotplugNotifier hotplugNotifier.append(self.hotplugCB) if dvd_device: @@ -627,6 +628,7 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP def __onClose(self): self.restore_infobar_seek_config() self.session.nav.playService(self.oldService) + from Plugins.SystemPlugins.Hotplug.plugin import hotplugNotifier hotplugNotifier.remove(self.hotplugCB) def playLastCB(self, answer): # overwrite infobar cuesheet function |
