Changeset 3935

Timestamp:

Sep 10, 2010, 3:41:57 PM (16 years ago)

Author:

civer

Message:

[ ALL/ IPK/ MediaPlayer]

• added MP to Extensions Menü (now you can find it in Blue-Key
• some MP translation fixes in enigma2.po

Location:

ipk/source

Files:

• epg_crossepg_0_41_svn38/var/usr/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/crossepg/crossepg_epgmove.sh (modified) (2 diffs)
• players_mediaplayer_1_0/usr/lib/enigma2/python/Plugins/Extensions/MediaPlayer/__init__.py (modified) (1 diff)
• players_mediaplayer_1_0/usr/lib/enigma2/python/Plugins/Extensions/MediaPlayer/plugin.py (modified) (2 diffs)
• swapplayers_mediaplayer_1_0/var/swap/extensions/MediaPlayer/__init__.py (modified) (1 diff)
• swapplayers_mediaplayer_1_0/var/swap/extensions/MediaPlayer/plugin.py (modified) (2 diffs)

ipk/source/epg_crossepg_0_41_svn38/var/usr/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/crossepg/crossepg_epgmove.sh

@@ -1 +1 @@
 #!/bin/sh
+
+#--- Civer add AAF specified options---
+locateepg=`cat /etc/enigma2/settings | grep config.epg.EPG_path | cut -d "=" -f 2`
+if [ "$locateepg" ]; then
+                epgfilelocation="$locateepg"
+else
+                epgfilelocation="/media/hdd/epg.dat"
+fi
+
 HOME=`echo $0 | sed "s/crossepg_epgmove\.sh//"`
 
@@ -9 +18 @@
 fi
 
-if [ -f "$DBROOT/ext.epg.dat" ] # try on configuration path
-then
-        echo copying ext.epg.dat from $DBROOT
-        $HOME/crossepg_epgcopy "$DBROOT/ext.epg.dat" /media/hdd/epg.dat
-elif [ -f "/media/hdd/crossepg/ext.epg.dat" ] # if we have a bad path try with default path
-then
-        echo copying ext.epg.dat from /media/hdd/crossepg/
-        $HOME/crossepg_epgcopy /media/hdd/crossepg/ext.epg.dat /media/hdd/epg.dat
-else # no epg found
-        echo ext.epg.dat not found
+if [ ! -f "$epgfilelocation" ]; then # skip epg copy if file exists
+        if [ -f "$DBROOT/ext.epg.dat" ] # try on configuration path
+        then
+                echo copying ext.epg.dat from $DBROOT
+                $HOME/crossepg_epgcopy "$DBROOT/ext.epg.dat" "$epgfilelocation"
+        elif [ -f "/media/hdd/crossepg/ext.epg.dat" ] # if we have a bad path try with default path
+        then
+                echo copying ext.epg.dat from /media/hdd/crossepg/
+                $HOME/crossepg_epgcopy /media/hdd/crossepg/ext.epg.dat "$epgfilelocation"
+        else # no epg found
+                echo ext.epg.dat not found
+        fi
 fi

ipk/source/players_mediaplayer_1_0/usr/lib/enigma2/python/Plugins/Extensions/MediaPlayer/__init__.py

@@ -1 @@
- 

ipk/source/players_mediaplayer_1_0/usr/lib/enigma2/python/Plugins/Extensions/MediaPlayer/plugin.py

@@ -539 +539 @@
                         menu.append((_("add/remove bookmarks (locationbox)"), "locationbox"))
                 if self.currList == "filelist":
-                        menu.append((_("---------------------- bookmarks -------------------"), "line"))
+                        menu.append((_("--------------------- bookmarks --------------------"), "line"))
                         for x in self.bookmarks.value:
                                 menu.append((x, x))
@@ -1194 +1194 @@
         return [
                 PluginDescriptor(name = "MediaPlayer", description = "Play back media files", where = PluginDescriptor.WHERE_MENU, fnc = menu),
+                PluginDescriptor(name = "MediaPlayer", description = "Play back media files", where = PluginDescriptor.WHERE_EXTENSIONSMENU, fnc = main),
                 PluginDescriptor(name = "MediaPlayer", where = PluginDescriptor.WHERE_FILESCAN, fnc = filescan)
         ]

ipk/source/swapplayers_mediaplayer_1_0/var/swap/extensions/MediaPlayer/__init__.py

@@ -1 @@
- 

ipk/source/swapplayers_mediaplayer_1_0/var/swap/extensions/MediaPlayer/plugin.py

@@ -539 +539 @@
                         menu.append((_("add/remove bookmarks (locationbox)"), "locationbox"))
                 if self.currList == "filelist":
-                        menu.append((_("---------------------- bookmarks -------------------"), "line"))
+                        menu.append((_("--------------------- bookmarks --------------------"), "line"))
                         for x in self.bookmarks.value:
                                 menu.append((x, x))
@@ -1194 +1194 @@
         return [
                 PluginDescriptor(name = "MediaPlayer", description = "Play back media files", where = PluginDescriptor.WHERE_MENU, fnc = menu),
+                PluginDescriptor(name = "MediaPlayer", description = "Play back media files", where = PluginDescriptor.WHERE_EXTENSIONSMENU, fnc = main),
                 PluginDescriptor(name = "MediaPlayer", where = PluginDescriptor.WHERE_FILESCAN, fnc = filescan)
         ]