SOURCES: mythtv-branch.diff - release-0-19-fixes at svn 10231

glen glen at pld-linux.org
Mon Jun 19 00:03:19 CEST 2006 

Author: glen                         Date: Sun Jun 18 22:03:19 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- release-0-19-fixes at svn 10231

---- Files affected:
SOURCES:
   mythtv-branch.diff (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/mythtv-branch.diff
diff -u SOURCES/mythtv-branch.diff:1.1 SOURCES/mythtv-branch.diff:1.2
--- SOURCES/mythtv-branch.diff:1.1	Sun May 28 13:58:59 2006
+++ SOURCES/mythtv-branch.diff	Mon Jun 19 00:03:14 2006
@@ -1,7 +1,7 @@
 Index: mythplugins/mythweb/themes/wml/header.php
 ===================================================================
---- mythplugins/mythweb/themes/wml/header.php	(.../tags/release-0-19)	(revision 10051)
-+++ mythplugins/mythweb/themes/wml/header.php	(.../branches/release-0-19-fixes)	(revision 10051)
+--- mythplugins/mythweb/themes/wml/header.php	(.../tags/release-0-19)	(revision 10231)
++++ mythplugins/mythweb/themes/wml/header.php	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -26,4 +26,4 @@
  <p><a href="<?php echo root ?>tv/upcoming"><?php echo t('Upcoming Recordings') ?></a></p>
  <p><a href="<?php echo root ?>tv/recorded"><?php echo t('Recorded Programs') ?></a></p>
@@ -10,8 +10,8 @@
 +<p><a href="<?php echo root ?>status/xml"><?php echo t('Backend Status') ?></a></p>
 Index: mythplugins/mythweb/themes/default/weather/weather.php
 ===================================================================
---- mythplugins/mythweb/themes/default/weather/weather.php	(.../tags/release-0-19)	(revision 10051)
-+++ mythplugins/mythweb/themes/default/weather/weather.php	(.../branches/release-0-19-fixes)	(revision 10051)
+--- mythplugins/mythweb/themes/default/weather/weather.php	(.../tags/release-0-19)	(revision 10231)
++++ mythplugins/mythweb/themes/default/weather/weather.php	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -93,13 +93,13 @@
                  $tomorrow = date("m/d/Y", mktime(0, 0, 0, date("m")  , date("d")+1, date("Y")));
  
@@ -29,8 +29,8 @@
  
 Index: mythplugins/mythweb/themes/default/music/music.php
 ===================================================================
---- mythplugins/mythweb/themes/default/music/music.php	(.../tags/release-0-19)	(revision 10051)
-+++ mythplugins/mythweb/themes/default/music/music.php	(.../branches/release-0-19-fixes)	(revision 10051)
+--- mythplugins/mythweb/themes/default/music/music.php	(.../tags/release-0-19)	(revision 10231)
++++ mythplugins/mythweb/themes/default/music/music.php	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -164,10 +164,12 @@
  
      function print_header($filterPlaylist,$filterArtist,$filterAlbum,$filterGenre) {
@@ -50,8 +50,8 @@
  
 Index: mythplugins/mythweb/themes/default/tv/detail.php
 ===================================================================
---- mythplugins/mythweb/themes/default/tv/detail.php	(.../tags/release-0-19)	(revision 10051)
-+++ mythplugins/mythweb/themes/default/tv/detail.php	(.../branches/release-0-19-fixes)	(revision 10051)
+--- mythplugins/mythweb/themes/default/tv/detail.php	(.../tags/release-0-19)	(revision 10231)
++++ mythplugins/mythweb/themes/default/tv/detail.php	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -51,7 +51,7 @@
  <?php   } ?>
              <div id="program_title">
@@ -63,8 +63,8 @@
  <?php
 Index: mythplugins/mythweb/includes/mythbackend.php
 ===================================================================
---- mythplugins/mythweb/includes/mythbackend.php	(.../tags/release-0-19)	(revision 10051)
-+++ mythplugins/mythweb/includes/mythbackend.php	(.../branches/release-0-19-fixes)	(revision 10051)
+--- mythplugins/mythweb/includes/mythbackend.php	(.../tags/release-0-19)	(revision 10231)
++++ mythplugins/mythweb/includes/mythbackend.php	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -15,10 +15,6 @@
  // The character string used by the backend to separate records
      define('backend_sep', '[]:[]');
@@ -78,8 +78,8 @@
      define('MYTH_PROTO_VERSION', 26);
 Index: mythplugins/mythweb/includes/programs.php
 ===================================================================
---- mythplugins/mythweb/includes/programs.php	(.../tags/release-0-19)	(revision 10051)
-+++ mythplugins/mythweb/includes/programs.php	(.../branches/release-0-19-fixes)	(revision 10051)
+--- mythplugins/mythweb/includes/programs.php	(.../tags/release-0-19)	(revision 10231)
++++ mythplugins/mythweb/includes/programs.php	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -81,7 +81,9 @@
  /**/
      function &load_all_program_data($start_time, $end_time, $chanid = false, $single_program = false, $extra_query = '') {
@@ -238,8 +238,8 @@
              $this->length = $this->recendts - $this->recstartts;
 Index: mythplugins/mythweb/includes/utils.php
 ===================================================================
---- mythplugins/mythweb/includes/utils.php	(.../tags/release-0-19)	(revision 10051)
-+++ mythplugins/mythweb/includes/utils.php	(.../branches/release-0-19-fixes)	(revision 10051)
+--- mythplugins/mythweb/includes/utils.php	(.../tags/release-0-19)	(revision 10231)
++++ mythplugins/mythweb/includes/utils.php	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -276,7 +276,7 @@
          static $first_run=true;
          if($first_run) {
@@ -251,8 +251,8 @@
          if (is_array($data) || is_object($data))
 Index: mythplugins/mythweb/includes/init.php
 ===================================================================
---- mythplugins/mythweb/includes/init.php	(.../tags/release-0-19)	(revision 10051)
-+++ mythplugins/mythweb/includes/init.php	(.../branches/release-0-19-fixes)	(revision 10051)
+--- mythplugins/mythweb/includes/init.php	(.../tags/release-0-19)	(revision 10231)
++++ mythplugins/mythweb/includes/init.php	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -16,28 +16,15 @@
   *
  /**/
@@ -323,8 +323,8 @@
  
 Index: mythplugins/mythweb/includes/mobile.php
 ===================================================================
---- mythplugins/mythweb/includes/mobile.php	(.../tags/release-0-19)	(revision 10051)
-+++ mythplugins/mythweb/includes/mobile.php	(.../branches/release-0-19-fixes)	(revision 10051)
+--- mythplugins/mythweb/includes/mobile.php	(.../tags/release-0-19)	(revision 10231)
++++ mythplugins/mythweb/includes/mobile.php	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -74,58 +74,56 @@
       * If you don't know the screensize of some mobile terminal then use
       * an empty array or approximate dimensions.
@@ -434,8 +434,8 @@
      /* Scan through $mobiles and try to find matching user agent. */
 Index: mythplugins/mythweb/includes/recording_schedules.php
 ===================================================================
---- mythplugins/mythweb/includes/recording_schedules.php	(.../tags/release-0-19)	(revision 10051)
-+++ mythplugins/mythweb/includes/recording_schedules.php	(.../branches/release-0-19-fixes)	(revision 10051)
+--- mythplugins/mythweb/includes/recording_schedules.php	(.../tags/release-0-19)	(revision 10231)
++++ mythplugins/mythweb/includes/recording_schedules.php	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -68,10 +68,14 @@
  // Cleanup
      mysql_free_result($result);
@@ -455,8 +455,8 @@
          if ($key === 'offset') {
 Index: mythplugins/mythweb/includes/session.php
 ===================================================================
---- mythplugins/mythweb/includes/session.php	(.../tags/release-0-19)	(revision 10051)
-+++ mythplugins/mythweb/includes/session.php	(.../branches/release-0-19-fixes)	(revision 10051)
+--- mythplugins/mythweb/includes/session.php	(.../tags/release-0-19)	(revision 10231)
++++ mythplugins/mythweb/includes/session.php	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -19,8 +19,8 @@
  
  // Start the session
@@ -470,8 +470,8 @@
  
 Index: mythplugins/mythweb/modules/weather/handler.php
 ===================================================================
---- mythplugins/mythweb/modules/weather/handler.php	(.../tags/release-0-19)	(revision 10051)
-+++ mythplugins/mythweb/modules/weather/handler.php	(.../branches/release-0-19-fixes)	(revision 10051)
+--- mythplugins/mythweb/modules/weather/handler.php	(.../tags/release-0-19)	(revision 10231)
++++ mythplugins/mythweb/modules/weather/handler.php	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -222,8 +222,10 @@
  
      $data = explode("|", $data);
@@ -487,8 +487,8 @@
          $forecast->DescText = (strlen($forecast->DescText) > 0) ? $forecast->DescText : t('Unknown') . " (" . $data[15+$i] . ")";
 Index: mythplugins/mythweb/modules/status/handler.php
 ===================================================================
---- mythplugins/mythweb/modules/status/handler.php	(.../tags/release-0-19)	(revision 10051)
-+++ mythplugins/mythweb/modules/status/handler.php	(.../branches/release-0-19-fixes)	(revision 10051)
+--- mythplugins/mythweb/modules/status/handler.php	(.../tags/release-0-19)	(revision 10231)
++++ mythplugins/mythweb/modules/status/handler.php	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -18,14 +18,17 @@
      $masterhost = get_backend_setting('MasterServerIP');
      $statusport = get_backend_setting('BackendStatusPort');
@@ -511,8 +511,8 @@
      preg_match('#<title>(.+?)</title>#s', $status, $title);
 Index: mythplugins/mythweb/modules/backend_log/handler.php
 ===================================================================
---- mythplugins/mythweb/modules/backend_log/handler.php	(.../tags/release-0-19)	(revision 10051)
-+++ mythplugins/mythweb/modules/backend_log/handler.php	(.../branches/release-0-19-fixes)	(revision 10051)
+--- mythplugins/mythweb/modules/backend_log/handler.php	(.../tags/release-0-19)	(revision 10231)
++++ mythplugins/mythweb/modules/backend_log/handler.php	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -16,7 +16,7 @@
  // Where to start searching from
      $_GET['start'] = intVal($_GET['start']);
@@ -524,8 +524,8 @@
      $_GET['show'] = intVal($_GET['show']);
 Index: mythplugins/mythweb/modules/tv/upcoming.php
 ===================================================================
---- mythplugins/mythweb/modules/tv/upcoming.php	(.../tags/release-0-19)	(revision 10051)
-+++ mythplugins/mythweb/modules/tv/upcoming.php	(.../branches/release-0-19-fixes)	(revision 10051)
+--- mythplugins/mythweb/modules/tv/upcoming.php	(.../tags/release-0-19)	(revision 10231)
++++ mythplugins/mythweb/modules/tv/upcoming.php	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -103,8 +103,9 @@
                          continue;
                  }
@@ -540,8 +540,8 @@
                  $all_shows[] =& $Scheduled_Recordings[$channum][$starttime][$key];
 Index: mythplugins/mythweb/modules/tv/recorded.php
 ===================================================================
---- mythplugins/mythweb/modules/tv/recorded.php	(.../tags/release-0-19)	(revision 10051)
-+++ mythplugins/mythweb/modules/tv/recorded.php	(.../branches/release-0-19-fixes)	(revision 10051)
+--- mythplugins/mythweb/modules/tv/recorded.php	(.../tags/release-0-19)	(revision 10231)
++++ mythplugins/mythweb/modules/tv/recorded.php	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -128,9 +128,21 @@
                  continue;
          // Get the length (27 == recendts; 26 == recstartts)
@@ -599,8 +599,8 @@
      require_once theme_dir.'tv/recorded.php';
 Index: mythplugins/mythweb/.htaccess
 ===================================================================
---- mythplugins/mythweb/.htaccess	(.../tags/release-0-19)	(revision 10051)
-+++ mythplugins/mythweb/.htaccess	(.../branches/release-0-19-fixes)	(revision 10051)
+--- mythplugins/mythweb/.htaccess	(.../tags/release-0-19)	(revision 10231)
++++ mythplugins/mythweb/.htaccess	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -22,6 +22,7 @@
  #    AuthName           "MythTV"
  #    AuthDigestFile     /var/www/htdigest
@@ -621,7 +621,7 @@
 Index: mythplugins/mythweb/js/debug.js
 ===================================================================
 --- mythplugins/mythweb/js/debug.js	(.../tags/release-0-19)	(revision 0)
-+++ mythplugins/mythweb/js/debug.js	(.../branches/release-0-19-fixes)	(revision 10051)
++++ mythplugins/mythweb/js/debug.js	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -0,0 +1,24 @@
 +/**
 + * A random assortment of javascript debug routines
@@ -659,8 +659,8 @@
 
 Index: mythplugins/mythweb/js/browser.js
 ===================================================================
---- mythplugins/mythweb/js/browser.js	(.../tags/release-0-19)	(revision 10051)
-+++ mythplugins/mythweb/js/browser.js	(.../branches/release-0-19-fixes)	(revision 10051)
+--- mythplugins/mythweb/js/browser.js	(.../tags/release-0-19)	(revision 10231)
++++ mythplugins/mythweb/js/browser.js	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -215,14 +215,18 @@
      browser.is_css = (document.body  && document.body.style)
      browser.is_w3c = (browser.is_css && browser.getElementById)
@@ -688,8 +688,8 @@
  
 Index: mythplugins/mythweb/README
 ===================================================================
---- mythplugins/mythweb/README	(.../tags/release-0-19)	(revision 10051)
-+++ mythplugins/mythweb/README	(.../branches/release-0-19-fixes)	(revision 10051)
+--- mythplugins/mythweb/README	(.../tags/release-0-19)	(revision 10231)
++++ mythplugins/mythweb/README	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -1,18 +1,12 @@
  This is the README file for the MythWeb package.
 -January 17, 2006
@@ -742,8 +742,8 @@
  
 Index: mythplugins/mythdvd/mtd/jobthread.cpp
 ===================================================================
---- mythplugins/mythdvd/mtd/jobthread.cpp	(.../tags/release-0-19)	(revision 10051)
-+++ mythplugins/mythdvd/mtd/jobthread.cpp	(.../branches/release-0-19-fixes)	(revision 10051)
+--- mythplugins/mythdvd/mtd/jobthread.cpp	(.../tags/release-0-19)	(revision 10231)
++++ mythplugins/mythdvd/mtd/jobthread.cpp	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -11,6 +11,7 @@
  #include <sys/types.h>
  #include <sys/stat.h>
@@ -754,8 +754,8 @@
  using namespace std;
 Index: mythplugins/mythdvd/mtd/mtd.cpp
 ===================================================================
---- mythplugins/mythdvd/mtd/mtd.cpp	(.../tags/release-0-19)	(revision 10051)
-+++ mythplugins/mythdvd/mtd/mtd.cpp	(.../branches/release-0-19-fixes)	(revision 10051)
+--- mythplugins/mythdvd/mtd/mtd.cpp	(.../tags/release-0-19)	(revision 10231)
++++ mythplugins/mythdvd/mtd/mtd.cpp	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -8,6 +8,7 @@
  
  */
@@ -766,8 +766,8 @@
  #include <qdir.h>
 Index: mythplugins/mythdvd/mtd/logging.cpp
 ===================================================================
---- mythplugins/mythdvd/mtd/logging.cpp	(.../tags/release-0-19)	(revision 10051)
-+++ mythplugins/mythdvd/mtd/logging.cpp	(.../branches/release-0-19-fixes)	(revision 10051)
+--- mythplugins/mythdvd/mtd/logging.cpp	(.../tags/release-0-19)	(revision 10231)
++++ mythplugins/mythdvd/mtd/logging.cpp	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -9,6 +9,7 @@
  */
  #include "logging.h"
@@ -778,8 +778,8 @@
  #include <mythtv/mythcontext.h>
 Index: mythplugins/mythmusic/mythmusic/vorbisdecoder.cpp
 ===================================================================
---- mythplugins/mythmusic/mythmusic/vorbisdecoder.cpp	(.../tags/release-0-19)	(revision 10051)
-+++ mythplugins/mythmusic/mythmusic/vorbisdecoder.cpp	(.../branches/release-0-19-fixes)	(revision 10051)
+--- mythplugins/mythmusic/mythmusic/vorbisdecoder.cpp	(.../tags/release-0-19)	(revision 10231)
++++ mythplugins/mythmusic/mythmusic/vorbisdecoder.cpp	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -12,6 +12,7 @@
  #include "metadata.h"
  #include "metaiooggvorbiscomment.h"
@@ -804,8 +804,8 @@
              bitrate = ov_bitrate_instant(&oggfile) / 1000;
 Index: mythplugins/mythmusic/mythmusic/flacdecoder.cpp
 ===================================================================
---- mythplugins/mythmusic/mythmusic/flacdecoder.cpp	(.../tags/release-0-19)	(revision 10051)
-+++ mythplugins/mythmusic/mythmusic/flacdecoder.cpp	(.../branches/release-0-19-fixes)	(revision 10051)
+--- mythplugins/mythmusic/mythmusic/flacdecoder.cpp	(.../tags/release-0-19)	(revision 10231)
++++ mythplugins/mythmusic/mythmusic/flacdecoder.cpp	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -12,6 +12,7 @@
  #include "metadata.h"
  #include "metaioflacvorbiscomment.h"
@@ -842,8 +842,8 @@
          }
 Index: mythplugins/mythmusic/mythmusic/maddecoder.cpp
 ===================================================================
---- mythplugins/mythmusic/mythmusic/maddecoder.cpp	(.../tags/release-0-19)	(revision 10051)
-+++ mythplugins/mythmusic/mythmusic/maddecoder.cpp	(.../branches/release-0-19-fixes)	(revision 10051)
+--- mythplugins/mythmusic/mythmusic/maddecoder.cpp	(.../tags/release-0-19)	(revision 10231)
++++ mythplugins/mythmusic/mythmusic/maddecoder.cpp	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -16,6 +16,7 @@
  #include <mythtv/audiooutput.h>
  #include "metaioid3v2.h"
@@ -889,8 +889,8 @@
      }
 Index: mythplugins/mythweather/mythweather/weather.cpp
 ===================================================================
---- mythplugins/mythweather/mythweather/weather.cpp	(.../tags/release-0-19)	(revision 10051)
-+++ mythplugins/mythweather/mythweather/weather.cpp	(.../branches/release-0-19-fixes)	(revision 10051)
+--- mythplugins/mythweather/mythweather/weather.cpp	(.../tags/release-0-19)	(revision 10231)
++++ mythplugins/mythweather/mythweather/weather.cpp	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -2571,6 +2571,14 @@
           return false;
       }
@@ -924,8 +924,8 @@
           sURL = QString("http://image.weather.com" + imageLoc + "%1L.jpg").arg(x);
 Index: mythplugins/mythcontrols/mythcontrols/mythcontrols.cpp
 ===================================================================
---- mythplugins/mythcontrols/mythcontrols/mythcontrols.cpp	(.../tags/release-0-19)	(revision 10051)
-+++ mythplugins/mythcontrols/mythcontrols/mythcontrols.cpp	(.../branches/release-0-19-fixes)	(revision 10051)
+--- mythplugins/mythcontrols/mythcontrols/mythcontrols.cpp	(.../tags/release-0-19)	(revision 10231)
++++ mythplugins/mythcontrols/mythcontrols/mythcontrols.cpp	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -46,22 +46,6 @@
  #include "keygrabber.h"
  
@@ -986,8 +986,8 @@
      {
 Index: mythplugins/mythcontrols/mythcontrols/actionset.cpp
 ===================================================================
---- mythplugins/mythcontrols/mythcontrols/actionset.cpp	(.../tags/release-0-19)	(revision 10051)
-+++ mythplugins/mythcontrols/mythcontrols/actionset.cpp	(.../branches/release-0-19-fixes)	(revision 10051)
+--- mythplugins/mythcontrols/mythcontrols/actionset.cpp	(.../tags/release-0-19)	(revision 10231)
++++ mythplugins/mythcontrols/mythcontrols/actionset.cpp	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -139,13 +139,19 @@
  /* method description in header */
  QStringList * ActionSet::actionStrings(const QString &context_name) const
@@ -1015,8 +1015,8 @@
  
 Index: mythplugins/mythcontrols/mythcontrols/keybindings.h
 ===================================================================
---- mythplugins/mythcontrols/mythcontrols/keybindings.h	(.../tags/release-0-19)	(revision 10051)
-+++ mythplugins/mythcontrols/mythcontrols/keybindings.h	(.../branches/release-0-19-fixes)	(revision 10051)
+--- mythplugins/mythcontrols/mythcontrols/keybindings.h	(.../tags/release-0-19)	(revision 10231)
++++ mythplugins/mythcontrols/mythcontrols/keybindings.h	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -65,6 +65,8 @@
      /**
       * @brief Get a list of the context names.
@@ -1028,8 +1028,8 @@
      {
 Index: mythplugins/mythvideo/mythvideo/videomanager.h
 ===================================================================
---- mythplugins/mythvideo/mythvideo/videomanager.h	(.../tags/release-0-19)	(revision 10051)
-+++ mythplugins/mythvideo/mythvideo/videomanager.h	(.../branches/release-0-19-fixes)	(revision 10051)
+--- mythplugins/mythvideo/mythvideo/videomanager.h	(.../tags/release-0-19)	(revision 10231)
++++ mythplugins/mythvideo/mythvideo/videomanager.h	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -30,7 +30,7 @@
    public:
      VideoManager(MythMainWindow *parent, const char *name = 0);
@@ -1041,8 +1041,8 @@
      void slotManualIMDB();
 Index: mythplugins/mythvideo/mythvideo/videoselected.h
 ===================================================================
---- mythplugins/mythvideo/mythvideo/videoselected.h	(.../tags/release-0-19)	(revision 10051)
-+++ mythplugins/mythvideo/mythvideo/videoselected.h	(.../branches/release-0-19-fixes)	(revision 10051)
+--- mythplugins/mythvideo/mythvideo/videoselected.h	(.../tags/release-0-19)	(revision 10231)
++++ mythplugins/mythvideo/mythvideo/videoselected.h	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -35,7 +35,7 @@
      VideoSelected(VideoList *lvideolist,
                   MythMainWindow *parent, const char *name = 0, int index = 0);
@@ -1054,8 +1054,8 @@
    protected slots:
 Index: mythplugins/mythphone/mythphone/sipfsm.h
 ===================================================================
---- mythplugins/mythphone/mythphone/sipfsm.h	(.../tags/release-0-19)	(revision 10051)
-+++ mythplugins/mythphone/mythphone/sipfsm.h	(.../branches/release-0-19-fixes)	(revision 10051)
+--- mythplugins/mythphone/mythphone/sipfsm.h	(.../tags/release-0-19)	(revision 10231)
++++ mythplugins/mythphone/mythphone/sipfsm.h	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -618,7 +618,7 @@
      SipWatcher *CreateWatcherFsm(QString Url);
      SipIM *CreateIMFsm(QString Url="", QString callIdStr="");
@@ -1067,8 +1067,8 @@
      int getPrimaryCall() { return primaryCall; };
 Index: mythplugins/mythphone/mythphone/vxml.h
 ===================================================================
---- mythplugins/mythphone/mythphone/vxml.h	(.../tags/release-0-19)	(revision 10051)
-+++ mythplugins/mythphone/mythphone/vxml.h	(.../branches/release-0-19-fixes)	(revision 10051)
+--- mythplugins/mythphone/mythphone/vxml.h	(.../tags/release-0-19)	(revision 10231)
++++ mythplugins/mythphone/mythphone/vxml.h	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -10,7 +10,7 @@
  {
    public:
@@ -1080,8 +1080,8 @@
      QString getName() { return Name; };
 Index: mythplugins/mythgame/mythgame/gamehandler.h
 ===================================================================
---- mythplugins/mythgame/mythgame/gamehandler.h	(.../tags/release-0-19)	(revision 10051)
-+++ mythplugins/mythgame/mythgame/gamehandler.h	(.../branches/release-0-19-fixes)	(revision 10051)
+--- mythplugins/mythgame/mythgame/gamehandler.h	(.../tags/release-0-19)	(revision 10231)
++++ mythplugins/mythgame/mythgame/gamehandler.h	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -106,7 +106,7 @@
  
    protected:
@@ -1093,8 +1093,8 @@
      int spandisks;
 Index: mythplugins/mythnews/mythnews/news-sites.xml
 ===================================================================
---- mythplugins/mythnews/mythnews/news-sites.xml	(.../tags/release-0-19)	(revision 10051)
-+++ mythplugins/mythnews/mythnews/news-sites.xml	(.../branches/release-0-19-fixes)	(revision 10051)
+--- mythplugins/mythnews/mythnews/news-sites.xml	(.../tags/release-0-19)	(revision 10231)
++++ mythplugins/mythnews/mythnews/news-sites.xml	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -119,7 +119,7 @@
  
      <item>
@@ -1104,10 +1104,47 @@
          <ico>http://slashdot.org/favicon.ico</ico>
      </item>
  
+Index: mythtv/libs/libmythtv/dvbchannel.h
+===================================================================
+--- mythtv/libs/libmythtv/dvbchannel.h	(.../tags/release-0-19)	(revision 10231)
++++ mythtv/libs/libmythtv/dvbchannel.h	(.../branches/release-0-19-fixes)	(revision 10231)
+@@ -60,11 +60,13 @@
+         { return chan_opts.pmt.HasTelevisionService(); }
+     /// Returns true iff we have a faulty DVB driver that munges PMT
+     bool HasCRCBug(void)                const { return has_crc_bug; }
++    uint GetMinSignalMonitorDelay(void) const { return sigmon_delay; }
+ 
+     // Commands
+     bool SwitchToInput(const QString &inputname, const QString &chan);
+     bool SwitchToInput(int newcapchannel, bool setstarting);
+     bool Tune(const dvb_channel_t& channel, bool force_reset=false);
++    bool Retune(void);
+ 
+     // Set/Get/Command just for SIScan/ScanWizardScanner
+     void SetMultiplexID(int mplexid)          { currentTID = mplexid; };
+@@ -109,11 +111,18 @@
+     volatile int      fd_frontend; ///< File descriptor for tuning hardware
+     int               cardnum;     ///< DVB Card number
+     bool              has_crc_bug; ///< true iff our driver munges PMT
++    uint              tuning_delay;///< Extra delay to add for broken drivers
++    uint              sigmon_delay;///< Minimum delay between FE_LOCK checks
+     int               currentTID;  ///< Stores mplexid from database
+ 
+     bool              first_tune;  ///< Used to force hardware reset
+ 
+     int               nextcapchannel; ///< Signal an input change
++
++    /// Last tuning options sent to hardware for retuning
++    DVBTuning         retune_tuning;
++    /// Retuning adjustment, required so drivers don't ignore retune request
++    int               retune_adj;
+ };
+ 
+ #endif
 Index: mythtv/libs/libmythtv/NuppelVideoPlayer.h
 ===================================================================
---- mythtv/libs/libmythtv/NuppelVideoPlayer.h	(.../tags/release-0-19)	(revision 10051)
-+++ mythtv/libs/libmythtv/NuppelVideoPlayer.h	(.../branches/release-0-19-fixes)	(revision 10051)
+--- mythtv/libs/libmythtv/NuppelVideoPlayer.h	(.../tags/release-0-19)	(revision 10231)
++++ mythtv/libs/libmythtv/NuppelVideoPlayer.h	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -150,7 +150,8 @@
      // Complicated gets
      long long CalcMaxFFTime(long long ff, bool setjump = true) const;
@@ -1118,7 +1155,24 @@
  
      /// Non-const gets
      OSD         *GetOSD(void)                 { return osd; }
-@@ -543,6 +544,7 @@
+@@ -297,6 +298,7 @@
+     bool DecodeFrame(struct rtframeheader *frameheader,
+                      unsigned char *strm, unsigned char *outbuf);
+ 
++    bool PrebufferEnoughFrames(void);
+     void CheckPrebuffering(void);
+     bool GetFrameNormal(int onlyvideo);
+     bool GetFrameFFREW(void);
+@@ -309,7 +311,7 @@
+     bool DoRewind(void);
+ 
+     // Private seeking stuff
+-    void ClearAfterSeek(void);
++    void ClearAfterSeek(bool clearvideobuffers = true);
+     bool FrameIsInMap(long long frameNumber, QMap<long long, int> &breakMap);
+     void JumpToFrame(long long frame);
+     void JumpToNetFrame(long long net) { JumpToFrame(framesPlayed + net); }
+@@ -543,6 +545,7 @@
      QMap<long long, int>::Iterator deleteIter;
      QMap<long long, int>::Iterator blankIter;
      QMap<long long, int>::Iterator commBreakIter;
@@ -1128,8 +1182,8 @@
      /// Lock for next_play_speed and next_normal_speed
 Index: mythtv/libs/libmythtv/osdlistbtntype.h
 ===================================================================
---- mythtv/libs/libmythtv/osdlistbtntype.h	(.../tags/release-0-19)	(revision 10051)
-+++ mythtv/libs/libmythtv/osdlistbtntype.h	(.../branches/release-0-19-fixes)	(revision 10051)
+--- mythtv/libs/libmythtv/osdlistbtntype.h	(.../tags/release-0-19)	(revision 10231)
++++ mythtv/libs/libmythtv/osdlistbtntype.h	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -1,3 +1,4 @@
 +// -*- Mode: c++ -*-
  /* ============================================================
@@ -1574,8 +1628,8 @@
  
 Index: mythtv/libs/libmythtv/NuppelVideoPlayer.cpp
 ===================================================================
---- mythtv/libs/libmythtv/NuppelVideoPlayer.cpp	(.../tags/release-0-19)	(revision 10051)
-+++ mythtv/libs/libmythtv/NuppelVideoPlayer.cpp	(.../branches/release-0-19-fixes)	(revision 10051)
+--- mythtv/libs/libmythtv/NuppelVideoPlayer.cpp	(.../tags/release-0-19)	(revision 10231)
++++ mythtv/libs/libmythtv/NuppelVideoPlayer.cpp	(.../branches/release-0-19-fixes)	(revision 10231)
 @@ -147,6 +147,7 @@
        hascommbreaktable(false),
        deleteIter(deleteMap.end()),  blankIter(blankMap.end()),
@@ -1602,7 +1656,116 @@
  
      if ((size.width() > 0) && (size.height() > 0))
      {
-@@ -1920,7 +1923,7 @@
+@@ -1626,8 +1629,8 @@
+         {
+             // If we are using hardware decoding, so we've already done the
+             // decoding; display the frame, but don't wait for A/V Sync.
+-            videoOutput->PrepareFrame(buffer, ps);
+-            videoOutput->Show(m_scan);
++            videoOutput->PrepareFrame(buffer, kScan_Intr2ndField);
++            videoOutput->Show(kScan_Intr2ndField);
+             VERBOSE(VB_PLAYBACK, LOC + dbg + "skipping A/V wait.");
+         }
+         else
+@@ -1685,14 +1688,14 @@
+ 
+     if (diverge > MAXDIVERGE)
+     {
+-        // If audio is way ahead of video, adjust for it...
++        // If audio is way behind of video, adjust for it...
+         // by cutting the frame rate in half for the length of this frame
+ 
+         avsync_adjustment = frame_interval;
+         lastsync = true;
+         VERBOSE(VB_PLAYBACK, LOC + 
+-                QString("Audio is %1 frames ahead of video,\n"
+-                        "\t\t\tdoubling video frame interval.").arg(diverge));
++                QString("Video is %1 frames ahead of audio,\n"
++                        "\t\t\tdoubling video frame interval to slow down.").arg(diverge));
+     }
+ 
+     if (audioOutput && normal_speed)
+@@ -1811,11 +1814,8 @@
+     videosync->Start();
+ }
+ 
+-void NuppelVideoPlayer::DisplayNormalFrame(void)
++bool NuppelVideoPlayer::PrebufferEnoughFrames(void)
+ {
+-    video_actually_paused = false;
+-    resetvideo = false;
+-
+     prebuffering_lock.lock();
+     if (prebuffering)
+     {
+@@ -1843,14 +1843,29 @@
+         }
+         prebuffering_lock.unlock();
+         videosync->Start();
+-        return;
++
++        return false;
+     }
+     prebuffering_lock.unlock();
+ 
+     //VERBOSE(VB_PLAYBACK, LOC + "fs: " + videoOutput->GetFrameStatus());
+     if (!videoOutput->EnoughPrebufferedFrames())
+     {
+-        VERBOSE(VB_GENERAL, LOC + "prebuffering pause");
++        if (videoOutput)
++        {
++            videoOutput->CheckFrameStates();
++            if (videoOutput->hasMCAcceleration()   ||
++                videoOutput->hasIDCTAcceleration() ||
++                videoOutput->hasVLDAcceleration())
++            {
++                // Prebuffering fails w/XvMC's 8 surfaces..
++                usleep(5000);
++                return false;
++            }
++        }
++        VERBOSE(VB_GENERAL, LOC + "prebuffering pause" +
++                videoOutput->GetFrameStatus());
++
+         SetPrebuffering(true);
+ #if FAST_RESTART
+         if (!m_playing_slower && audio_channels <= 2)
+@@ -1861,7 +1876,7 @@
+             VERBOSE(VB_GENERAL, "playing slower due to falling behind...");
+         }
+ #endif
+-        return;
++        return false;
+     }
+ 
+ #if FAST_RESTART
+@@ -1877,6 +1892,25 @@
+     prebuffer_tries = 0;
+     prebuffering_lock.unlock();
+ 
++    return true;
++}
++
++void NuppelVideoPlayer::DisplayNormalFrame(void)
++{
++    video_actually_paused = false;
++    resetvideo = false;
++
++    if (!PrebufferEnoughFrames())
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/mythtv-branch.diff?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list