- switchtimer added to RecordingTimer

- media player to play mp3, ogg (not yet fully working) and ts files (needs gstreamer)
- language selection saves a language string instead of a changing index number

9 files changed, 45 insertions, 2 deletions

diff --git a/data/dvr-buttons-small-fs8.png b/data/dvr-buttons-small-fs8.png
new file mode 100644
index 00000000..90cae68a
--- /dev/null
+++ b/data/dvr-buttons-small-fs8.png
diff --git a/data/forward-small-fs8.png b/data/forward-small-fs8.png
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/data/forward-small-fs8.png
diff --git a/data/keymap.xml b/data/keymap.xml
index 93c0118c..8e3bf7da 100644
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -284,10 +284,20 @@
 	</map>
 	
 	<map context="DirectionActions">
-		<key id="KEY_UP" mapto="up" flags="m" />		
+		<key id="KEY_UP" mapto="up" flags="m" />
 		<key id="KEY_DOWN" mapto="down" flags="m" />
-		<key id="KEY_LEFT" mapto="left" flags="m" />		
+		<key id="KEY_LEFT" mapto="left" flags="m" />
 		<key id="KEY_RIGHT" mapto="right" flags="m" />
+
+		<key id="KEY_UP" mapto="upRepeated" flags="r" />
+		<key id="KEY_DOWN" mapto="downRepeated" flags="r" />
+		<key id="KEY_LEFT" mapto="leftRepeated" flags="r" />
+		<key id="KEY_RIGHT" mapto="rightRepeated" flags="r" />
+		
+		<key id="KEY_LEFT" mapto="leftUp" flags="b" />
+		<key id="KEY_RIGHT" mapto="rightUp" flags="b" />
+		<key id="KEY_UP" mapto="upUp" flags="b" />
+		<key id="KEY_DOWN" mapto="downUp" flags="b" />
 	</map>
 	
 	<map context="ColorActions">
@@ -335,4 +345,15 @@
 		<key id="KEY_EXIT" mapto="leave" flags="m" />
 		<key id="KEY_OK" mapto="showMenu" flags="m" />
 	</map>
+	
+	<map context="MediaPlayerSeekActions">
+		<key id="KEY_YELLOW" mapto="pause" flags="m" />
+		<key id="KEY_GREEN" mapto="play" flags="m" />
+		<key id="KEY_TV" mapto="stop" flags="m" />
+
+		<key id="KEY_PREVIOUS" mapto="previous" flags="mr" />
+		<key id="KEY_NEXT" mapto="next" flags="mr" />
+		
+		<key id="KEY_MENU" mapto="menu" flags="m" />
+	</map>
 </keymap>
diff --git a/data/menu.xml b/data/menu.xml
index 79a72347..db3c95ef 100644
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -17,6 +17,7 @@
 		<item text="Network setup">self.openSetup("network")</item>-->
 		<!--<item text="CI"><screen module="Ci" screen="CiSelection" /></item>-->
 		<!--<item text="Radio"><code>print "radio mode"</code></item>-->
+		<item text="Media player"><screen module="MediaPlayer" screen="MediaPlayer" /></item>
 		<item text="Timer"><screen module="TimerEdit" screen="TimerEditList" /></item>
 		<item text="VCR scart"><screen module="Scart" screen="Scart" /></item>
 
diff --git a/data/pause-small-fs8.png b/data/pause-small-fs8.png
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/data/pause-small-fs8.png
diff --git a/data/play-small-fs8.png b/data/play-small-fs8.png
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/data/play-small-fs8.png
diff --git a/data/rewind-small-fs8.png b/data/rewind-small-fs8.png
new file mode 100644
index 00000000..286b4110
--- /dev/null
+++ b/data/rewind-small-fs8.png
diff --git a/data/skin.xml b/data/skin.xml
index 38d6fa3e..502a3dd4 100644
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -97,5 +97,26 @@
 			<widget name="ElapsedTime" position="475,60" size="75,20" halign="left" backgroundColor="dark" font="Regular;18" />
 			<widget name="PositionGauge" position="247,60" size="225,20" zPosition="2" pointer="position_pointer.png:3,5"/>
 		</screen>
+		
+		<screen name="MediaPlayer" position="100,100" size="550,400" title="MediaPlayer" >
+			<widget name="currenttext" position="0,0" size="550,30" font="Regular;18" valign="center" backgroundColor="#101258" />
+			
+			<widget name="filelist" position="10,30" size="255,265" scrollbarMode="showOnDemand" />
+			<widget name="playlist" position="265,30" size="285,265" scrollbarMode="showOnDemand" selectionDisabled="1" />
+			
+			<ePixmap position="10,365" zPosition="0" size="177,32" pixmap="dvr-buttons-small-fs8.png" />
+			<widget name="PositionGauge" position="10,335" size="177,20" zPosition="2" pointer="position_pointer.png:3,5"/>
+			
+			<widget name="artisttext" position="200,300" size="70,23" font="Regular;18" valign="center" backgroundColor="#101258" />
+			<widget name="artist" position="270,300" size="280,23" font="Regular;18" valign="center" backgroundColor="#101258" />
+			<widget name="titletext" position="200,323" size="70,23" font="Regular;18" valign="center" backgroundColor="#101258" />
+			<widget name="title" position="270,323" size="280,23" font="Regular;18" valign="center" backgroundColor="#101258" />
+			<widget name="albumtext" position="200,346" size="70,23" font="Regular;18" valign="center" backgroundColor="#101258" />
+			<widget name="album" position="270,346" size="280,23" font="Regular;18" valign="center" backgroundColor="#101258" />
+			<widget name="yeartext" position="200,369" size="70,23" font="Regular;18" valign="center" backgroundColor="#101258" />
+			<widget name="year" position="270,369" size="100,23" font="Regular;18" valign="center" backgroundColor="#101258" />
+			<widget name="genretext" position="370,369" size="70,23" font="Regular;18" valign="center" backgroundColor="#101258" />
+			<widget name="genre" position="440,369" size="110,23" font="Regular;18" valign="center" backgroundColor="#101258" />
+		</screen>
 
 </skin>
diff --git a/data/stop-small-fs8.png b/data/stop-small-fs8.png
new file mode 100644
index 00000000..ba2e14d3
--- /dev/null
+++ b/data/stop-small-fs8.png