Merge branch 'master' of git://git.opendreambox.org/git/enigma2
authorpieterg <pieterg@users.sourceforge.net>
Thu, 28 Jan 2010 10:18:51 +0000 (11:18 +0100)
committerpieterg <pieterg@users.sourceforge.net>
Thu, 28 Jan 2010 10:18:51 +0000 (11:18 +0100)
Conflicts:
lib/python/Plugins/Extensions/MediaPlayer/plugin.py: use ours
lib/python/Plugins/SystemPlugins/Makefile.am: merge
lib/python/Screens/PluginBrowser.py: use ours
lib/service/servicedvb.cpp: trivial

1  2 
configure.ac
lib/python/Components/Converter/Makefile.am
lib/python/Components/FileList.py
lib/python/Plugins/SystemPlugins/Makefile.am
lib/python/Screens/ChannelSelection.py
lib/python/Screens/InfoBarGenerics.py
lib/python/Screens/PluginBrowser.py
lib/python/Screens/Satconfig.py
lib/python/Screens/Standby.py
lib/service/servicedvb.cpp

diff --cc configure.ac
Simple merge
@@@ -5,6 -5,5 +5,6 @@@ install_PYTHON = 
        Poll.py RemainingToText.py StringList.py ServiceName.py FrontendInfo.py ServiceInfo.py \
        ConditionalShowHide.py ServicePosition.py ValueRange.py RdsInfo.py Streaming.py \
        StaticMultiList.py ServiceTime.py MovieInfo.py MenuEntryCompare.py StringListSelection.py \
 +      ServiceOrbitalPosition.py CryptoInfo.py TextCase.py \
        ValueBitTest.py TunerInfo.py ConfigEntryTest.py TemplatedMultiContent.py ProgressToText.py \
-       Combine.py
+       Combine.py SensorToText.py
Simple merge
@@@ -3,8 -3,8 +3,9 @@@ installdir = $(pkglibdir)/python/Plugin
  SUBDIRS = SoftwareManager FrontprocessorUpgrade PositionerSetup Satfinder \
        SkinSelector SatelliteEquipmentControl Videomode VideoTune Hotplug \
        DefaultServicesScanner NFIFlash DiseqcTester CommonInterfaceAssignment \
 +      SoftwareUpdate ConfigurationBackup CableScan FastScan \
-       CrashlogAutoSubmit CleanupWizard VideoEnhancement WirelessLan NetworkWizard
+       CrashlogAutoSubmit CleanupWizard VideoEnhancement WirelessLan NetworkWizard \
+       TempFanControl
  
  install_PYTHON =      \
        __init__.py
@@@ -752,9 -712,9 +751,10 @@@ class ChannelSelectionBase(Screen)
                self.servicePathTV = [ ]
                self.servicePathRadio = [ ]
                self.servicePath = [ ]
+               self.rootChanged = False
  
                self.mode = MODE_TV
 +              self.dopipzap = False
  
                self.pathChangeDisabled = False
  
@@@ -2036,20 -2009,15 +2036,22 @@@ class InfoBarCueSheetSupport
                        for (pts, what) in self.cut_list:
                                if what == self.CUT_TYPE_LAST:
                                        last = pts
 -
 -                      if last is not None:
 +                                      break
 +                      else:
 +                              return
 +                      # only resume if at least 10 seconds ahead, or <10 seconds before the end.
 +                      seekable = self.__getSeekable()
 +                      if seekable is None:
 +                              return # Should not happen?
 +                      length = seekable.getLength() or (None,0)
 +                      print "seekable.getLength() returns:", length
 +                      # Hmm, this implies we don't resume if the length is unknown...
 +                      if last is not None and (last > 900000) and (last < length[1] - 900000):
                                self.resume_point = last
+                               
+                               l = last / 90000
                                if config.usage.on_movie_start.value == "ask":
-                                       Notifications.AddNotificationWithCallback(self.playLastCB, MessageBox, _("Do you want to resume this playback?"), timeout=10)
+                                       Notifications.AddNotificationWithCallback(self.playLastCB, MessageBox, _("Do you want to resume this playback?") + "\n" + (_("Resume position at %s") % ("%d:%02d:%02d" % (l/3600, l%3600/60, l%60))), timeout=10)
                                elif config.usage.on_movie_start.value == "resume":
  # TRANSLATORS: The string "Resuming playback" flashes for a moment
  # TRANSLATORS: at the start of a movie, when the user has selected
Simple merge
Simple merge
Simple merge
@@@ -1189,7 -1128,6 +1189,10 @@@ RESULT eDVBServicePlay::stop(
                        
                        if (length)
                        {
++<<<<<<< HEAD
 +                              /* Always store last play position, solve "border" cases in Python code */
++=======
++>>>>>>> 025acea46debca45f8ae004cdb17cc6e5fc84309
                                m_cue_entries.insert(cueEntry(play_position, 3)); /* last play position */
                        }
                        m_cuesheet_changed = 1;