From 103f4bf674f20b4431233ac066089e6de16ea480 Mon Sep 17 00:00:00 2001
From: Fraxinas <andreas.frisch@multimedia-labs.de>
Date: Fri, 14 Nov 2008 22:31:31 +0100
Subject: [PATCH] callbacks that are added upon hotplug events can be added to
 a hotplugNotifier list now. use this to speed up Audio CD recognition in
 MediaPlayer

---
 .../Plugins/Extensions/MediaPlayer/plugin.py  | 35 +++++++++++--------
 .../Plugins/SystemPlugins/Hotplug/plugin.py   |  8 +++++
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
index b12e03e5..876e2a48 100644
--- a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
@@ -21,6 +21,7 @@ from Components.Harddisk import harddiskmanager
 from Components.config import config
 from Tools.Directories import fileExists, pathExists, resolveFilename, SCOPE_CONFIG, SCOPE_PLAYLIST, SCOPE_SKIN_IMAGE
 from settings import MediaPlayerSettings
+from Plugins.SystemPlugins.Hotplug.plugin import hotplugNotifier
 import random
 
 class MyPlayList(PlayList):
@@ -96,6 +97,7 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB
 		self["repeat"] = MultiPixmap()
 
 		self.seek_target = None
+		hotplugNotifier.append(self.hotplugCB)
 
 		class MoviePlayerActionMap(NumberActionMap):
 			def __init__(self, player, contexts = [ ], actions = { }, prio=0):
@@ -171,7 +173,7 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB
 		self.coverArtFileName = ""
 		self.isAudioCD = False
 		self.AudioCD_albuminfo = {}
-
+		self.cdAudioTrackFiles = []
 		self.applySettings()
 
 		self.playlistIOInternal = PlaylistIOInternal()
@@ -203,6 +205,7 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB
 		if config.mediaplayer.saveDirOnExit.getValue():
 			config.mediaplayer.defaultDir.setValue(self.filelist.getCurrentDirectory())
 			config.mediaplayer.defaultDir.save()
+		hotplugNotifier.remove(self.hotplugCB)
 		self.close()
 
 	def checkSkipShowHideLock(self):
@@ -445,6 +448,8 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB
 
 	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"))
@@ -462,9 +467,6 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB
 		menu.append((_("load playlist"), "loadplaylist"));
 		menu.append((_("delete saved playlist"), "deleteplaylist"));
 		menu.append((_("Edit settings"), "settings"))
-		drivepath = harddiskmanager.getAutofsMountpoint(harddiskmanager.getCD())
-		if pathExists(drivepath):
-			menu.insert(0,(_("Play Audio-CD..."), "audiocd"))
 		self.session.openWithCallback(self.menuCallback, ChoiceBox, title="", list=menu)
 
 	def menuCallback(self, choice):
@@ -504,16 +506,6 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB
 		elif choice[1] == "settings":
 			self.session.openWithCallback(self.applySettings, MediaPlayerSettings, self)
 		elif choice[1] == "audiocd":
-			from Components.Scanner import scanDevice
-			drivepath = harddiskmanager.getAutofsMountpoint(harddiskmanager.getCD())
-			self.cdAudioTrackFiles = []
-			res = scanDevice(drivepath)
-			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)
 			self.playAudioCD()
 
 	def playAudioCD(self):
@@ -867,7 +859,20 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB
 		
 	def subtitleSelection(self):
 		from Screens.Subtitles import Subtitles
-		self.session.open(Subtitles)		
+		self.session.open(Subtitles)
+	
+	def hotplugCB(self, dev, media_state):
+		if dev == harddiskmanager.getCD():	
+			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)
 
 class MediaPlayerLCDScreen(Screen):
 	skin = """
diff --git a/lib/python/Plugins/SystemPlugins/Hotplug/plugin.py b/lib/python/Plugins/SystemPlugins/Hotplug/plugin.py
index 469b1dd0..97ddf4a1 100644
--- a/lib/python/Plugins/SystemPlugins/Hotplug/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/Hotplug/plugin.py
@@ -8,6 +8,8 @@ DEVICEDB =  \
 	  "/devices/pci0000:00/0000:00:14.2/usb1/1-1/1-1:1.0/host0/target1:0:0/0:0:0:0": "SD Slot"
 	}
 
+hotplugNotifier = [ ]
+
 class Hotplug(Protocol):
 	def getUserfriendlyDeviceName(self, phys):
 		return DEVICEDB.get(phys, "USB Storage")
@@ -48,6 +50,12 @@ class Hotplug(Protocol):
 				harddiskmanager.addHotplugPartition(dev, self.getUserfriendlyDeviceName(physdevpath))
 			elif media_state == '0':
 				harddiskmanager.removeHotplugPartition(dev)
+		
+		for callback in hotplugNotifier:
+			try:
+				callback(dev, media_state)
+			except AttributeError:
+				hotplugNotifier.remove(callback)
 
 def autostart(reason, **kwargs):
 	if reason == 0:
-- 
2.30.2