SOURCES: mythtv-branch.diff - up to svn 10931
glen
glen at pld-linux.org
Thu Aug 24 21:30:46 CEST 2006
Author: glen Date: Thu Aug 24 19:30:46 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- up to svn 10931
---- Files affected:
SOURCES:
mythtv-branch.diff (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/mythtv-branch.diff
diff -u SOURCES/mythtv-branch.diff:1.2 SOURCES/mythtv-branch.diff:1.3
--- SOURCES/mythtv-branch.diff:1.2 Mon Jun 19 00:03:14 2006
+++ SOURCES/mythtv-branch.diff Thu Aug 24 21:30:41 2006
@@ -1,7 +1,7 @@
Index: mythplugins/mythweb/themes/wml/header.php
===================================================================
---- 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)
+--- mythplugins/mythweb/themes/wml/header.php (.../tags/release-0-19) (revision 10931)
++++ mythplugins/mythweb/themes/wml/header.php (.../branches/release-0-19-fixes) (revision 10931)
@@ -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 10231)
-+++ mythplugins/mythweb/themes/default/weather/weather.php (.../branches/release-0-19-fixes) (revision 10231)
+--- mythplugins/mythweb/themes/default/weather/weather.php (.../tags/release-0-19) (revision 10931)
++++ mythplugins/mythweb/themes/default/weather/weather.php (.../branches/release-0-19-fixes) (revision 10931)
@@ -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 10231)
-+++ mythplugins/mythweb/themes/default/music/music.php (.../branches/release-0-19-fixes) (revision 10231)
+--- mythplugins/mythweb/themes/default/music/music.php (.../tags/release-0-19) (revision 10931)
++++ mythplugins/mythweb/themes/default/music/music.php (.../branches/release-0-19-fixes) (revision 10931)
@@ -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 10231)
-+++ mythplugins/mythweb/themes/default/tv/detail.php (.../branches/release-0-19-fixes) (revision 10231)
+--- mythplugins/mythweb/themes/default/tv/detail.php (.../tags/release-0-19) (revision 10931)
++++ mythplugins/mythweb/themes/default/tv/detail.php (.../branches/release-0-19-fixes) (revision 10931)
@@ -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 10231)
-+++ mythplugins/mythweb/includes/mythbackend.php (.../branches/release-0-19-fixes) (revision 10231)
+--- mythplugins/mythweb/includes/mythbackend.php (.../tags/release-0-19) (revision 10931)
++++ mythplugins/mythweb/includes/mythbackend.php (.../branches/release-0-19-fixes) (revision 10931)
@@ -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 10231)
-+++ mythplugins/mythweb/includes/programs.php (.../branches/release-0-19-fixes) (revision 10231)
+--- mythplugins/mythweb/includes/programs.php (.../tags/release-0-19) (revision 10931)
++++ mythplugins/mythweb/includes/programs.php (.../branches/release-0-19-fixes) (revision 10931)
@@ -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 10231)
-+++ mythplugins/mythweb/includes/utils.php (.../branches/release-0-19-fixes) (revision 10231)
+--- mythplugins/mythweb/includes/utils.php (.../tags/release-0-19) (revision 10931)
++++ mythplugins/mythweb/includes/utils.php (.../branches/release-0-19-fixes) (revision 10931)
@@ -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 10231)
-+++ mythplugins/mythweb/includes/init.php (.../branches/release-0-19-fixes) (revision 10231)
+--- mythplugins/mythweb/includes/init.php (.../tags/release-0-19) (revision 10931)
++++ mythplugins/mythweb/includes/init.php (.../branches/release-0-19-fixes) (revision 10931)
@@ -16,28 +16,15 @@
*
/**/
@@ -323,8 +323,8 @@
Index: mythplugins/mythweb/includes/mobile.php
===================================================================
---- mythplugins/mythweb/includes/mobile.php (.../tags/release-0-19) (revision 10231)
-+++ mythplugins/mythweb/includes/mobile.php (.../branches/release-0-19-fixes) (revision 10231)
+--- mythplugins/mythweb/includes/mobile.php (.../tags/release-0-19) (revision 10931)
++++ mythplugins/mythweb/includes/mobile.php (.../branches/release-0-19-fixes) (revision 10931)
@@ -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 10231)
-+++ mythplugins/mythweb/includes/recording_schedules.php (.../branches/release-0-19-fixes) (revision 10231)
+--- mythplugins/mythweb/includes/recording_schedules.php (.../tags/release-0-19) (revision 10931)
++++ mythplugins/mythweb/includes/recording_schedules.php (.../branches/release-0-19-fixes) (revision 10931)
@@ -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 10231)
-+++ mythplugins/mythweb/includes/session.php (.../branches/release-0-19-fixes) (revision 10231)
+--- mythplugins/mythweb/includes/session.php (.../tags/release-0-19) (revision 10931)
++++ mythplugins/mythweb/includes/session.php (.../branches/release-0-19-fixes) (revision 10931)
@@ -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 10231)
-+++ mythplugins/mythweb/modules/weather/handler.php (.../branches/release-0-19-fixes) (revision 10231)
+--- mythplugins/mythweb/modules/weather/handler.php (.../tags/release-0-19) (revision 10931)
++++ mythplugins/mythweb/modules/weather/handler.php (.../branches/release-0-19-fixes) (revision 10931)
@@ -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 10231)
-+++ mythplugins/mythweb/modules/status/handler.php (.../branches/release-0-19-fixes) (revision 10231)
+--- mythplugins/mythweb/modules/status/handler.php (.../tags/release-0-19) (revision 10931)
++++ mythplugins/mythweb/modules/status/handler.php (.../branches/release-0-19-fixes) (revision 10931)
@@ -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 10231)
-+++ mythplugins/mythweb/modules/backend_log/handler.php (.../branches/release-0-19-fixes) (revision 10231)
+--- mythplugins/mythweb/modules/backend_log/handler.php (.../tags/release-0-19) (revision 10931)
++++ mythplugins/mythweb/modules/backend_log/handler.php (.../branches/release-0-19-fixes) (revision 10931)
@@ -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 10231)
-+++ mythplugins/mythweb/modules/tv/upcoming.php (.../branches/release-0-19-fixes) (revision 10231)
+--- mythplugins/mythweb/modules/tv/upcoming.php (.../tags/release-0-19) (revision 10931)
++++ mythplugins/mythweb/modules/tv/upcoming.php (.../branches/release-0-19-fixes) (revision 10931)
@@ -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 10231)
-+++ mythplugins/mythweb/modules/tv/recorded.php (.../branches/release-0-19-fixes) (revision 10231)
+--- mythplugins/mythweb/modules/tv/recorded.php (.../tags/release-0-19) (revision 10931)
++++ mythplugins/mythweb/modules/tv/recorded.php (.../branches/release-0-19-fixes) (revision 10931)
@@ -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 10231)
-+++ mythplugins/mythweb/.htaccess (.../branches/release-0-19-fixes) (revision 10231)
+--- mythplugins/mythweb/.htaccess (.../tags/release-0-19) (revision 10931)
++++ mythplugins/mythweb/.htaccess (.../branches/release-0-19-fixes) (revision 10931)
@@ -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 10231)
++++ mythplugins/mythweb/js/debug.js (.../branches/release-0-19-fixes) (revision 10931)
@@ -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 10231)
-+++ mythplugins/mythweb/js/browser.js (.../branches/release-0-19-fixes) (revision 10231)
+--- mythplugins/mythweb/js/browser.js (.../tags/release-0-19) (revision 10931)
++++ mythplugins/mythweb/js/browser.js (.../branches/release-0-19-fixes) (revision 10931)
@@ -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 10231)
-+++ mythplugins/mythweb/README (.../branches/release-0-19-fixes) (revision 10231)
+--- mythplugins/mythweb/README (.../tags/release-0-19) (revision 10931)
++++ mythplugins/mythweb/README (.../branches/release-0-19-fixes) (revision 10931)
@@ -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 10231)
-+++ mythplugins/mythdvd/mtd/jobthread.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythplugins/mythdvd/mtd/jobthread.cpp (.../tags/release-0-19) (revision 10931)
++++ mythplugins/mythdvd/mtd/jobthread.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -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 10231)
-+++ mythplugins/mythdvd/mtd/mtd.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythplugins/mythdvd/mtd/mtd.cpp (.../tags/release-0-19) (revision 10931)
++++ mythplugins/mythdvd/mtd/mtd.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -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 10231)
-+++ mythplugins/mythdvd/mtd/logging.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythplugins/mythdvd/mtd/logging.cpp (.../tags/release-0-19) (revision 10931)
++++ mythplugins/mythdvd/mtd/logging.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -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 10231)
-+++ mythplugins/mythmusic/mythmusic/vorbisdecoder.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythplugins/mythmusic/mythmusic/vorbisdecoder.cpp (.../tags/release-0-19) (revision 10931)
++++ mythplugins/mythmusic/mythmusic/vorbisdecoder.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -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 10231)
-+++ mythplugins/mythmusic/mythmusic/flacdecoder.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythplugins/mythmusic/mythmusic/flacdecoder.cpp (.../tags/release-0-19) (revision 10931)
++++ mythplugins/mythmusic/mythmusic/flacdecoder.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -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 10231)
-+++ mythplugins/mythmusic/mythmusic/maddecoder.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythplugins/mythmusic/mythmusic/maddecoder.cpp (.../tags/release-0-19) (revision 10931)
++++ mythplugins/mythmusic/mythmusic/maddecoder.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -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 10231)
-+++ mythplugins/mythweather/mythweather/weather.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythplugins/mythweather/mythweather/weather.cpp (.../tags/release-0-19) (revision 10931)
++++ mythplugins/mythweather/mythweather/weather.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -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 10231)
-+++ mythplugins/mythcontrols/mythcontrols/mythcontrols.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythplugins/mythcontrols/mythcontrols/mythcontrols.cpp (.../tags/release-0-19) (revision 10931)
++++ mythplugins/mythcontrols/mythcontrols/mythcontrols.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -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 10231)
-+++ mythplugins/mythcontrols/mythcontrols/actionset.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythplugins/mythcontrols/mythcontrols/actionset.cpp (.../tags/release-0-19) (revision 10931)
++++ mythplugins/mythcontrols/mythcontrols/actionset.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -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 10231)
-+++ mythplugins/mythcontrols/mythcontrols/keybindings.h (.../branches/release-0-19-fixes) (revision 10231)
+--- mythplugins/mythcontrols/mythcontrols/keybindings.h (.../tags/release-0-19) (revision 10931)
++++ mythplugins/mythcontrols/mythcontrols/keybindings.h (.../branches/release-0-19-fixes) (revision 10931)
@@ -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 10231)
-+++ mythplugins/mythvideo/mythvideo/videomanager.h (.../branches/release-0-19-fixes) (revision 10231)
+--- mythplugins/mythvideo/mythvideo/videomanager.h (.../tags/release-0-19) (revision 10931)
++++ mythplugins/mythvideo/mythvideo/videomanager.h (.../branches/release-0-19-fixes) (revision 10931)
@@ -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 10231)
-+++ mythplugins/mythvideo/mythvideo/videoselected.h (.../branches/release-0-19-fixes) (revision 10231)
+--- mythplugins/mythvideo/mythvideo/videoselected.h (.../tags/release-0-19) (revision 10931)
++++ mythplugins/mythvideo/mythvideo/videoselected.h (.../branches/release-0-19-fixes) (revision 10931)
@@ -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 10231)
-+++ mythplugins/mythphone/mythphone/sipfsm.h (.../branches/release-0-19-fixes) (revision 10231)
+--- mythplugins/mythphone/mythphone/sipfsm.h (.../tags/release-0-19) (revision 10931)
++++ mythplugins/mythphone/mythphone/sipfsm.h (.../branches/release-0-19-fixes) (revision 10931)
@@ -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 10231)
-+++ mythplugins/mythphone/mythphone/vxml.h (.../branches/release-0-19-fixes) (revision 10231)
+--- mythplugins/mythphone/mythphone/vxml.h (.../tags/release-0-19) (revision 10931)
++++ mythplugins/mythphone/mythphone/vxml.h (.../branches/release-0-19-fixes) (revision 10931)
@@ -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 10231)
-+++ mythplugins/mythgame/mythgame/gamehandler.h (.../branches/release-0-19-fixes) (revision 10231)
+--- mythplugins/mythgame/mythgame/gamehandler.h (.../tags/release-0-19) (revision 10931)
++++ mythplugins/mythgame/mythgame/gamehandler.h (.../branches/release-0-19-fixes) (revision 10931)
@@ -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 10231)
-+++ mythplugins/mythnews/mythnews/news-sites.xml (.../branches/release-0-19-fixes) (revision 10231)
+--- mythplugins/mythnews/mythnews/news-sites.xml (.../tags/release-0-19) (revision 10931)
++++ mythplugins/mythnews/mythnews/news-sites.xml (.../branches/release-0-19-fixes) (revision 10931)
@@ -119,7 +119,7 @@
<item>
@@ -1106,8 +1106,8 @@
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)
+--- mythtv/libs/libmythtv/dvbchannel.h (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/dvbchannel.h (.../branches/release-0-19-fixes) (revision 10931)
@@ -60,11 +60,13 @@
{ return chan_opts.pmt.HasTelevisionService(); }
/// Returns true iff we have a faulty DVB driver that munges PMT
@@ -1143,8 +1143,8 @@
#endif
Index: mythtv/libs/libmythtv/NuppelVideoPlayer.h
===================================================================
---- mythtv/libs/libmythtv/NuppelVideoPlayer.h (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmythtv/NuppelVideoPlayer.h (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmythtv/NuppelVideoPlayer.h (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/NuppelVideoPlayer.h (.../branches/release-0-19-fixes) (revision 10931)
@@ -150,7 +150,8 @@
// Complicated gets
long long CalcMaxFFTime(long long ff, bool setjump = true) const;
@@ -1182,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 10231)
-+++ mythtv/libs/libmythtv/osdlistbtntype.h (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmythtv/osdlistbtntype.h (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/osdlistbtntype.h (.../branches/release-0-19-fixes) (revision 10931)
@@ -1,3 +1,4 @@
+// -*- Mode: c++ -*-
/* ============================================================
@@ -1628,8 +1628,8 @@
Index: mythtv/libs/libmythtv/NuppelVideoPlayer.cpp
===================================================================
---- mythtv/libs/libmythtv/NuppelVideoPlayer.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmythtv/NuppelVideoPlayer.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmythtv/NuppelVideoPlayer.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/NuppelVideoPlayer.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -147,6 +147,7 @@
hascommbreaktable(false),
deleteIter(deleteMap.end()), blankIter(blankMap.end()),
@@ -1940,8 +1940,8 @@
subtitleOSD->AddType(image);
Index: mythtv/libs/libmythtv/NuppelVideoRecorder.cpp
===================================================================
---- mythtv/libs/libmythtv/NuppelVideoRecorder.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmythtv/NuppelVideoRecorder.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmythtv/NuppelVideoRecorder.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/NuppelVideoRecorder.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -216,7 +216,10 @@
}
@@ -1998,8 +1998,8 @@
blocksize *= 4;
Index: mythtv/libs/libmythtv/signalmonitor.cpp
===================================================================
---- mythtv/libs/libmythtv/signalmonitor.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmythtv/signalmonitor.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmythtv/signalmonitor.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/signalmonitor.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -100,9 +100,9 @@
uint wait_for_mask, const char *name)
: QObject(NULL, name), channel(_channel),
@@ -2015,8 +2015,8 @@
signalStrength(QObject::tr("Signal Power"), "signal",
Index: mythtv/libs/libmythtv/osdlistbtntype.cpp
===================================================================
---- mythtv/libs/libmythtv/osdlistbtntype.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmythtv/osdlistbtntype.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmythtv/osdlistbtntype.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/osdlistbtntype.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -19,206 +19,148 @@
*
* ============================================================ */
@@ -3347,8 +3347,8 @@
-
Index: mythtv/libs/libmythtv/RingBuffer.cpp
===================================================================
---- mythtv/libs/libmythtv/RingBuffer.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmythtv/RingBuffer.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmythtv/RingBuffer.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/RingBuffer.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -145,6 +145,12 @@
VERBOSE(VB_PLAYBACK, LOC + QString("OpenFile(%1, %1)")
.arg(lfilename).arg(retryCount));
@@ -3475,8 +3475,8 @@
if (commserror)
Index: mythtv/libs/libmythtv/hdtvrecorder.cpp
===================================================================
---- mythtv/libs/libmythtv/hdtvrecorder.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmythtv/hdtvrecorder.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmythtv/hdtvrecorder.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/hdtvrecorder.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -627,9 +627,8 @@
len += remainder;
@@ -3491,8 +3491,8 @@
FinishRecording();
Index: mythtv/libs/libmythtv/dummydtvrecorder.cpp
===================================================================
---- mythtv/libs/libmythtv/dummydtvrecorder.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmythtv/dummydtvrecorder.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmythtv/dummydtvrecorder.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/dummydtvrecorder.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -125,7 +125,8 @@
// TRANSFER DATA
while (_request_recording || _frames_seen_count <= 5)
@@ -3517,8 +3517,8 @@
FinishRecording();
Index: mythtv/libs/libmythtv/avformatdecoder.cpp
===================================================================
---- mythtv/libs/libmythtv/avformatdecoder.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmythtv/avformatdecoder.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmythtv/avformatdecoder.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/avformatdecoder.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -725,7 +725,12 @@
return -1;
}
@@ -3534,8 +3534,8 @@
VERBOSE(VB_IMPORTANT, LOC_ERR + "Could not find codec parameters. " +
Index: mythtv/libs/libmythtv/osdtypes.cpp
===================================================================
---- mythtv/libs/libmythtv/osdtypes.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmythtv/osdtypes.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmythtv/osdtypes.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/osdtypes.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -14,6 +14,9 @@
#include "mythcontext.h"
@@ -4248,8 +4248,8 @@
Index: mythtv/libs/libmythtv/tv_play.cpp
===================================================================
---- mythtv/libs/libmythtv/tv_play.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmythtv/tv_play.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmythtv/tv_play.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/tv_play.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -247,7 +247,7 @@
browsechannum(""), browsechanid(""), browsestarttime(""),
// Program Info for currently playing video
@@ -4503,8 +4503,8 @@
/** \fn TV::PauseLiveTV(void)
Index: mythtv/libs/libmythtv/jobqueue.cpp
===================================================================
---- mythtv/libs/libmythtv/jobqueue.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmythtv/jobqueue.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmythtv/jobqueue.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/jobqueue.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -275,6 +275,11 @@
(hostname != "") &&
(hostname != m_hostname))
@@ -4519,8 +4519,8 @@
.arg(JobText(type))
Index: mythtv/libs/libmythtv/dvbdev/dvbdev.c
===================================================================
---- mythtv/libs/libmythtv/dvbdev/dvbdev.c (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmythtv/dvbdev/dvbdev.c (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmythtv/dvbdev/dvbdev.c (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/dvbdev/dvbdev.c (.../branches/release-0-19-fixes) (revision 10931)
@@ -29,55 +29,79 @@
const char* dvbdevice(int type, int cardnum)
@@ -4616,8 +4616,8 @@
switch(type)
Index: mythtv/libs/libmythtv/videosource.h
===================================================================
---- mythtv/libs/libmythtv/videosource.h (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmythtv/videosource.h (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmythtv/videosource.h (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/videosource.h (.../branches/release-0-19-fixes) (revision 10931)
@@ -75,6 +75,7 @@
static CARD_TYPES GetDVBType(uint device, QString &name, QString &card_type);
@@ -4628,9 +4628,20 @@
static bool IgnoreEncrypted(uint cardid, const QString &inputname);
Index: mythtv/libs/libmythtv/libmythtv.pro
===================================================================
---- mythtv/libs/libmythtv/libmythtv.pro (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmythtv/libmythtv.pro (.../branches/release-0-19-fixes) (revision 10231)
-@@ -144,10 +144,10 @@
+--- mythtv/libs/libmythtv/libmythtv.pro (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/libmythtv.pro (.../branches/release-0-19-fixes) (revision 10931)
+@@ -119,6 +119,10 @@
+ SOURCES += playgroup.cpp
+ SOURCES += progdetails.cpp
+
++# C stuff
++HEADERS += frequencies.h
++SOURCES += frequencies.c
++
+ using_frontend {
+ # Recording profile stuff
+ HEADERS += profilegroup.h
+@@ -144,10 +148,10 @@
# On screen display (video output overlay)
HEADERS += osd.h osdtypes.h
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/mythtv-branch.diff?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list