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>
+<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")));
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) {
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">
<?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', '[]:[]');
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 = '') {
$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) {
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 @@
*
/**/
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.
/* 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);
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
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);
$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');
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']);
$_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;
}
$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)
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
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
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)
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
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>
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 @@
*/
#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"
#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"
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"
}
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"
}
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;
}
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"
{
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
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.
{
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);
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);
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="");
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:
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:
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>
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
#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;
/// 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++ -*-
/* ============================================================
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()),
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 @@
}
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),
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 @@
*
* ============================================================ */
-
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));
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;
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)
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;
}
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"
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
/** \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))
.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)
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);
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
HEADERS += osdsurface.h osdlistbtntype.h
# Video output
HEADERS += videooutbase.h videoout_null.h
+@@ -303,10 +307,6 @@
+ }
+ }
+
+- # C stuff
+- HEADERS += frequencies.h
+- SOURCES += frequencies.c
+-
+ DEFINES += USING_BACKEND
+ }
+
Index: mythtv/libs/libmythtv/dvbchannel.cpp
===================================================================
---- mythtv/libs/libmythtv/dvbchannel.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmythtv/dvbchannel.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmythtv/dvbchannel.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/dvbchannel.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -74,14 +74,27 @@
* \bug Only supports single input cards.
*/
}
Index: mythtv/libs/libmythtv/osdtypes.h
===================================================================
---- mythtv/libs/libmythtv/osdtypes.h (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmythtv/osdtypes.h (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmythtv/osdtypes.h (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/osdtypes.h (.../branches/release-0-19-fixes) (revision 10931)
@@ -8,6 +8,7 @@
#include <vector>
#include <qobject.h>
Index: mythtv/libs/libmythtv/videoout_xv.h
===================================================================
---- mythtv/libs/libmythtv/videoout_xv.h (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmythtv/videoout_xv.h (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmythtv/videoout_xv.h (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/videoout_xv.h (.../branches/release-0-19-fixes) (revision 10931)
@@ -80,6 +80,8 @@
virtual bool hasVLDAcceleration(void) const
{ return XVideoVLD == VideoOutputSubType(); }
Index: mythtv/libs/libmythtv/osdimagecache.h
===================================================================
--- mythtv/libs/libmythtv/osdimagecache.h (.../tags/release-0-19) (revision 0)
-+++ mythtv/libs/libmythtv/osdimagecache.h (.../branches/release-0-19-fixes) (revision 10231)
++++ mythtv/libs/libmythtv/osdimagecache.h (.../branches/release-0-19-fixes) (revision 10931)
@@ -0,0 +1,74 @@
+// -*- Mode: c++ -*-
+
+};
Index: mythtv/libs/libmythtv/tv_play.h
===================================================================
---- mythtv/libs/libmythtv/tv_play.h (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmythtv/tv_play.h (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmythtv/tv_play.h (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/tv_play.h (.../branches/release-0-19-fixes) (revision 10931)
@@ -456,7 +456,6 @@
ProgramInfo *recorderPlaybackInfo; ///< info requested from recorder
ProgramInfo *playbackinfo; ///< info sent in via Playback()
RingBuffer *prbuffer;
Index: mythtv/libs/libmythtv/videosource.cpp
===================================================================
---- mythtv/libs/libmythtv/videosource.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmythtv/videosource.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmythtv/videosource.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/videosource.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -32,6 +32,7 @@
#include "videosource.h"
#include "datadirect.h"
"defined in the General settings."));
Index: mythtv/libs/libmythtv/frequencytables.cpp
===================================================================
---- mythtv/libs/libmythtv/frequencytables.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmythtv/frequencytables.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmythtv/frequencytables.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/frequencytables.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -283,104 +283,52 @@
"ATSC Channel %1", 70, 809000000, 887000000, 6000000, VSB_8);
#endif // USING_DVB
- "QAM-256 HRC %1", 100, 649750000, 799750000, 6000000, QAM_256);
- fmap["atsc_qam256_ushrc6"] = new FrequencyTable(
- "QAM-256 HRC T-%1", 7, 8175000, 50750000, 6000000, QAM_256);
-+ for (uint i = 0; i < 3; i++)
++ for (uint i = 0; i < 4; i++)
+ {
+ // USA Cable, ch 1 to 155 and T.7 to T.14
+ FREQ(modStr[i], "cable0", desc[i], "Channel %1",
}
Index: mythtv/libs/libmythtv/scanwizardhelpers.h
===================================================================
---- mythtv/libs/libmythtv/scanwizardhelpers.h (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmythtv/scanwizardhelpers.h (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmythtv/scanwizardhelpers.h (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/scanwizardhelpers.h (.../branches/release-0-19-fixes) (revision 10931)
@@ -272,11 +272,13 @@
public:
ScanFrequencyTable()
setHelpText(QObject::tr("Frequency table to use.") + " " +
Index: mythtv/libs/libmythtv/scanwizard.cpp
===================================================================
---- mythtv/libs/libmythtv/scanwizard.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmythtv/scanwizard.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmythtv/scanwizard.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/scanwizard.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -518,7 +518,9 @@
"SELECT dvb_diseqc_type, diseqc_port, diseqc_pos, "
" lnb_lof_switch, lnb_lof_hi, lnb_lof_lo "
if (query.exec() && query.isActive() && query.size() > 0)
Index: mythtv/libs/libmythtv/videoout_xv.cpp
===================================================================
---- mythtv/libs/libmythtv/videoout_xv.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmythtv/videoout_xv.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmythtv/videoout_xv.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/videoout_xv.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -1089,6 +1089,9 @@
bool use_xv = true, use_shm = true;
vbuffers.RemoveInheritence(pframe);
Index: mythtv/libs/libmythtv/signalmonitor.h
===================================================================
---- mythtv/libs/libmythtv/signalmonitor.h (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmythtv/signalmonitor.h (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmythtv/signalmonitor.h (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/signalmonitor.h (.../branches/release-0-19-fixes) (revision 10931)
@@ -7,6 +7,10 @@
// C headers
#include <pthread.h>
bool update_done;
Index: mythtv/libs/libmythtv/RingBuffer.h
===================================================================
---- mythtv/libs/libmythtv/RingBuffer.h (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmythtv/RingBuffer.h (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmythtv/RingBuffer.h (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/RingBuffer.h (.../branches/release-0-19-fixes) (revision 10931)
@@ -91,6 +91,7 @@
long long GetTotalReadPosition(void);
static void *StartReader(void *type);
Index: mythtv/libs/libmythtv/dvbtypes.cpp
===================================================================
---- mythtv/libs/libmythtv/dvbtypes.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmythtv/dvbtypes.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmythtv/dvbtypes.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/dvbtypes.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -202,7 +202,7 @@
{
{"TRANSMISSION_MODE_AUTO",TRANSMISSION_MODE_AUTO},
Index: mythtv/libs/libmythtv/mpegrecorder.cpp
===================================================================
---- mythtv/libs/libmythtv/mpegrecorder.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmythtv/mpegrecorder.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmythtv/mpegrecorder.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/mpegrecorder.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -363,9 +363,9 @@
if (ioctl(chanfd, VIDIOC_S_CTRL, &ctrl) < 0)
}
Index: mythtv/libs/libmythtv/ivtvdecoder.cpp
===================================================================
---- mythtv/libs/libmythtv/ivtvdecoder.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmythtv/ivtvdecoder.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmythtv/ivtvdecoder.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/ivtvdecoder.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -270,7 +270,9 @@
GetNVP()->SetVideoParams(720 /*width*/, (ntsc) ? 480 : 576 /*height*/,
if (m_playbackinfo || livetv || watchingrecording)
Index: mythtv/libs/libmythtv/dvbsignalmonitor.cpp
===================================================================
---- mythtv/libs/libmythtv/dvbsignalmonitor.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmythtv/dvbsignalmonitor.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmythtv/dvbsignalmonitor.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/dvbsignalmonitor.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -100,6 +100,10 @@
#undef DVB_IO
AddFlags(newflags);
Index: mythtv/libs/libmythtv/tv_rec.cpp
===================================================================
---- mythtv/libs/libmythtv/tv_rec.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmythtv/tv_rec.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmythtv/tv_rec.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/tv_rec.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -130,6 +130,11 @@
// RingBuffer info
ringBuffer(NULL), rbFilePrefix(""), rbFileExt("mpg")
*
Index: mythtv/libs/libmythtv/videooutbase.h
===================================================================
---- mythtv/libs/libmythtv/videooutbase.h (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmythtv/videooutbase.h (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmythtv/videooutbase.h (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/videooutbase.h (.../branches/release-0-19-fixes) (revision 10931)
@@ -256,6 +256,8 @@
/// onto the queue of frames ready for decoding onto.
virtual void DiscardFrames(bool kf) { vbuffers.DiscardFrames(kf); }
Index: mythtv/libs/libmythtv/osdimagecache.cpp
===================================================================
--- mythtv/libs/libmythtv/osdimagecache.cpp (.../tags/release-0-19) (revision 0)
-+++ mythtv/libs/libmythtv/osdimagecache.cpp (.../branches/release-0-19-fixes) (revision 10231)
++++ mythtv/libs/libmythtv/osdimagecache.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -0,0 +1,296 @@
+// -*- Mode: c++ -*-
+/** OSDImageCache
+}
Index: mythtv/libs/libmythtv/osd.cpp
===================================================================
---- mythtv/libs/libmythtv/osd.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmythtv/osd.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmythtv/osd.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/osd.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -154,7 +154,8 @@
}
set->Display();
Index: mythtv/libs/libmythtv/tv_rec.h
===================================================================
---- mythtv/libs/libmythtv/tv_rec.h (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmythtv/tv_rec.h (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmythtv/tv_rec.h (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/tv_rec.h (.../branches/release-0-19-fixes) (revision 10931)
@@ -13,6 +13,7 @@
#include "mythdeque.h"
#include "programinfo.h"
static const uint kSignalMonitoringRate;
Index: mythtv/libs/libmythtv/videobuffers.h
===================================================================
---- mythtv/libs/libmythtv/videobuffers.h (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmythtv/videobuffers.h (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmythtv/videobuffers.h (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/videobuffers.h (.../branches/release-0-19-fixes) (revision 10931)
@@ -40,6 +40,7 @@
kVideoBuffer_used = 0x00000004,
kVideoBuffer_pause = 0x00000008,
kVideoBuffer_all = 0x0000001F,
};
+@@ -159,7 +160,6 @@
+ uint vpos;
+
+ mutable QMutex global_lock;
+- QMutex inheritence_lock;
+
+ bool use_frame_locks;
+ QMutex frame_lock;
Index: mythtv/libs/libmythtv/dvbconfparser.cpp
===================================================================
---- mythtv/libs/libmythtv/dvbconfparser.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmythtv/dvbconfparser.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmythtv/dvbconfparser.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/dvbconfparser.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -193,10 +193,10 @@
QStringList::Iterator end = tokens.end();
if (i != end) c.serviceid = (*i++).toInt(); else return false;
Index: mythtv/libs/libmythtv/pchdtvsignalmonitor.cpp
===================================================================
---- mythtv/libs/libmythtv/pchdtvsignalmonitor.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmythtv/pchdtvsignalmonitor.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmythtv/pchdtvsignalmonitor.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/pchdtvsignalmonitor.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -108,8 +108,8 @@
len += remainder;
}
Index: mythtv/libs/libmythtv/videobuffers.cpp
===================================================================
---- mythtv/libs/libmythtv/videobuffers.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmythtv/videobuffers.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmythtv/videobuffers.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmythtv/videobuffers.cpp (.../branches/release-0-19-fixes) (revision 10931)
+@@ -84,7 +84,7 @@
+ : numbuffers(0), needfreeframes(0), needprebufferframes(0),
+ needprebufferframes_normal(0), needprebufferframes_small(0),
+ keepprebufferframes(0), need_extra_for_pause(false), rpos(0), vpos(0),
+- global_lock(true), inheritence_lock(false), use_frame_locks(true),
++ global_lock(true), use_frame_locks(true),
+ frame_lock(true)
+ {
+ }
@@ -125,6 +125,8 @@
{
global_lock.lock();
global_lock.unlock();
}
}
+@@ -857,7 +865,7 @@
+ {
+ (void)frame;
+ #ifdef USING_XVMC
+- inheritence_lock.lock();
++ global_lock.lock();
+
+ frame_map_t::iterator it = parents.find(frame);
+ if (it == parents.end())
+@@ -902,18 +910,18 @@
+ children[*it].push_back((VideoFrame*)frame);
+ }
+
+- inheritence_lock.unlock();
++ global_lock.unlock();
+ #endif // USING_XVMC
+ }
+
+ void VideoBuffers::RemoveInheritence(const VideoFrame *frame)
+ {
+- inheritence_lock.lock();
++ global_lock.lock();
+
+ frame_map_t::iterator it = parents.find(frame);
+ if (it == parents.end())
+ {
+- inheritence_lock.unlock();
++ global_lock.unlock();
+ return;
+ }
+
+@@ -945,7 +953,7 @@
+ .arg(i).arg(DebugString(*pit)));
+ }
+
+- inheritence_lock.unlock();
++ global_lock.unlock();
+ }
+
+ frame_queue_t VideoBuffers::Children(const VideoFrame *frame)
Index: mythtv/libs/libavformat/aviobuf.c
===================================================================
---- mythtv/libs/libavformat/aviobuf.c (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libavformat/aviobuf.c (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libavformat/aviobuf.c (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libavformat/aviobuf.c (.../branches/release-0-19-fixes) (revision 10931)
@@ -164,7 +164,13 @@
void url_fskip(ByteIOContext *s, offset_t offset)
offset_t url_ftell(ByteIOContext *s)
Index: mythtv/libs/libmyth/lcddevice.cpp
===================================================================
---- mythtv/libs/libmyth/lcddevice.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmyth/lcddevice.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmyth/lcddevice.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmyth/lcddevice.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -150,7 +150,7 @@
if (!connected)
{
Index: mythtv/libs/libmyth/audiooutputca.cpp
===================================================================
---- mythtv/libs/libmyth/audiooutputca.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmyth/audiooutputca.cpp (.../branches/release-0-19-fixes) (revision 10231)
-@@ -107,8 +107,10 @@
+--- mythtv/libs/libmyth/audiooutputca.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmyth/audiooutputca.cpp (.../branches/release-0-19-fixes) (revision 10931)
+@@ -21,6 +21,7 @@
+
+ #include "mythcontext.h"
+ #include "audiooutputca.h"
++#include "config.h"
+
+ // this holds Core Audio member variables
+ struct CoreAudioData {
+@@ -107,8 +108,10 @@
bzero(&conv_in_desc, sizeof(AudioStreamBasicDescription));
conv_in_desc.mSampleRate = audio_samplerate;
conv_in_desc.mFormatID = kAudioFormatLinearPCM;
conv_in_desc.mBytesPerFrame = audio_bytes_per_sample;
Index: mythtv/libs/libmyth/util.cpp
===================================================================
---- mythtv/libs/libmyth/util.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmyth/util.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmyth/util.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmyth/util.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -1006,16 +1006,20 @@
long long freespace = -1;
QCString cstr = file_on_disk.local8Bit();
}
Index: mythtv/libs/libmyth/mythdialogs.cpp
===================================================================
---- mythtv/libs/libmyth/mythdialogs.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmyth/mythdialogs.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmyth/mythdialogs.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmyth/mythdialogs.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -2617,6 +2617,7 @@
password_editor->setEchoMode(QLineEdit::Password);
password_editor->setGeometry(textWidth + 20,10,135,30);
Index: mythtv/libs/libmyth/mythwidgets.cpp
===================================================================
---- mythtv/libs/libmyth/mythwidgets.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmyth/mythwidgets.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmyth/mythwidgets.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmyth/mythwidgets.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -353,7 +353,8 @@
(e->key() == Qt::Key_Enter) ||
(e->key() == Qt::Key_Return)))
QTextEdit::keyPressEvent(e);
Index: mythtv/libs/libmyth/remotefile.h
===================================================================
---- mythtv/libs/libmyth/remotefile.h (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmyth/remotefile.h (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmyth/remotefile.h (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmyth/remotefile.h (.../branches/release-0-19-fixes) (revision 10931)
@@ -27,6 +27,8 @@
long long GetFileSize(void);
#endif
Index: mythtv/libs/libmyth/mythwidgets.h
===================================================================
---- mythtv/libs/libmyth/mythwidgets.h (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmyth/mythwidgets.h (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmyth/mythwidgets.h (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmyth/mythwidgets.h (.../branches/release-0-19-fixes) (revision 10931)
@@ -122,17 +122,21 @@
Q_OBJECT
public:
Index: mythtv/libs/libmyth/mythcontext.cpp
===================================================================
---- mythtv/libs/libmyth/mythcontext.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmyth/mythcontext.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmyth/mythcontext.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmyth/mythcontext.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -2621,9 +2621,13 @@
d->LoadLogSettings();
if (d->m_logenable == 1)
Index: mythtv/libs/libmyth/remotefile.cpp
===================================================================
---- mythtv/libs/libmyth/remotefile.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libmyth/remotefile.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libmyth/remotefile.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libmyth/remotefile.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -15,6 +15,7 @@
path = url;
readposition = 0;
+
Index: mythtv/libs/libavcodec/libavcodec.pro
===================================================================
---- mythtv/libs/libavcodec/libavcodec.pro (.../tags/release-0-19) (revision 10231)
-+++ mythtv/libs/libavcodec/libavcodec.pro (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/libs/libavcodec/libavcodec.pro (.../tags/release-0-19) (revision 10931)
++++ mythtv/libs/libavcodec/libavcodec.pro (.../branches/release-0-19-fixes) (revision 10931)
@@ -430,4 +430,5 @@
LIBS += -lz
QMAKE_LFLAGS_SHLIB += -single_module
}
Index: mythtv/programs/mythfrontend/playbackbox.cpp
===================================================================
---- mythtv/programs/mythfrontend/playbackbox.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/programs/mythfrontend/playbackbox.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/programs/mythfrontend/playbackbox.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/programs/mythfrontend/playbackbox.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -17,6 +17,7 @@
#include <qsqldatabase.h>
#include <qmap.h>
}
/* have we timed out waiting for nvp to start? */
+@@ -1272,10 +1280,10 @@
+ paintSkipUpdate = false;
+ update(drawTotalBounds);
+ }
++ else if (arrowAccel)
++ showActionsSelected();
+ else if (curitem && curitem->availableStatus != asAvailable)
+ showAvailablePopup(curitem);
+- else if (arrowAccel)
+- showActionsSelected();
+ }
+
+ void PlaybackBox::cursorDown(bool page, bool newview)
@@ -1380,6 +1388,7 @@
asCache[asKey] = p->availableStatus;
}
p = *i;
if ((((p->recgroup == recGroup) ||
((recGroup == "All Programs") &&
-@@ -4129,8 +4139,7 @@
+@@ -1886,7 +1896,8 @@
+ if (inTitle && haveGroupInfoSet)
+ return;
+
+- if (curitem->availableStatus != asAvailable)
++ if ((curitem->availableStatus != asAvailable) &&
++ (curitem->availableStatus != asFileNotFound))
+ showAvailablePopup(curitem);
+ else
+ showActions(curitem);
+@@ -2068,7 +2079,21 @@
+
+ delitem = new ProgramInfo(*toExp);
+
+- if (delitem->availableStatus != asAvailable)
++ if (fileExists(delitem) == false)
++ {
++ QString msg =
++ QString("PlaybackBox::showActions(): Error, %1 file not found")
++ .arg(delitem->pathname);
++ VERBOSE(VB_IMPORTANT, msg);
++
++ ProgramInfo *tmpItem = findMatchingProg(delitem);
++ if (tmpItem)
++ {
++ tmpItem->availableStatus = asFileNotFound;
++ showFileNotFoundActionPopup(delitem);
++ }
++ }
++ else if (delitem->availableStatus != asAvailable)
+ showAvailablePopup(delitem);
+ else
+ showActionPopup(delitem);
+@@ -2647,6 +2672,34 @@
+ expectingPopup = true;
+ }
+
++void PlaybackBox::showFileNotFoundActionPopup(ProgramInfo *program)
++{
++ if (!curitem || !program)
++ return;
++
++ popup = new MythPopupBox(gContext->GetMainWindow(), drawPopupSolid,
++ drawPopupFgColor, drawPopupBgColor,
++ drawPopupSelColor, "action popup");
++
++ QString msg = QObject::tr("Recording Unavailable") + "\n";
++ msg += QObject::tr("The file for this recording can "
++ "not be found") + "\n";
++
++ initPopup(popup, program, "", msg);
++
++ QButton *detailsButton;
++ detailsButton = popup->addButton(tr("Show Program Details"), this,
++ SLOT(showProgramDetails()));
++
++ popup->addButton(tr("Delete"), this, SLOT(askDelete()));
++
++ popup->ShowPopup(this, SLOT(doCancel()));
++
++ detailsButton->setFocus();
++
++ expectingPopup = true;
++}
++
+ void PlaybackBox::initPopup(MythPopupBox *popup, ProgramInfo *program,
+ QString message, QString message2)
+ {
+@@ -4129,8 +4182,7 @@
if (!recGroupListBox)
return;
if (item.left(5) == "-----")
{
-@@ -4147,8 +4156,7 @@
+@@ -4147,8 +4199,7 @@
void PlaybackBox::setGroupFilter(void)
{
groupDisplayName = recGroup;
Index: mythtv/programs/mythfrontend/customrecord.cpp
===================================================================
---- mythtv/programs/mythfrontend/customrecord.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/programs/mythfrontend/customrecord.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/programs/mythfrontend/customrecord.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/programs/mythfrontend/customrecord.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -149,7 +149,7 @@
m_cfrom << "";
m_csql << "program.stars >= 0.75 ";
{
Index: mythtv/programs/mythfrontend/tv_schedule.xml
===================================================================
---- mythtv/programs/mythfrontend/tv_schedule.xml (.../tags/release-0-19) (revision 10231)
-+++ mythtv/programs/mythfrontend/tv_schedule.xml (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/programs/mythfrontend/tv_schedule.xml (.../tags/release-0-19) (revision 10931)
++++ mythtv/programs/mythfrontend/tv_schedule.xml (.../branches/release-0-19-fixes) (revision 10931)
@@ -26,7 +26,7 @@
<alttext lang="CA">Guia</alttext>
<alttext lang="DE">EPG</alttext>
<alttext lang="JA">ガイド</alttext>
Index: mythtv/programs/mythfrontend/playbackbox.h
===================================================================
---- mythtv/programs/mythfrontend/playbackbox.h (.../tags/release-0-19) (revision 10231)
-+++ mythtv/programs/mythfrontend/playbackbox.h (.../branches/release-0-19-fixes) (revision 10231)
-@@ -337,6 +337,7 @@
+--- mythtv/programs/mythfrontend/playbackbox.h (.../tags/release-0-19) (revision 10931)
++++ mythtv/programs/mythfrontend/playbackbox.h (.../branches/release-0-19-fixes) (revision 10931)
+@@ -237,6 +237,7 @@
+ void promptEndOfRecording(ProgramInfo *);
+ void showDeletePopup(ProgramInfo *, deletePopupType);
+ void showActionPopup(ProgramInfo *program);
++ void showFileNotFoundActionPopup(ProgramInfo *program);
+ void initPopup(MythPopupBox *popup, ProgramInfo *program,
+ QString message, QString message2);
+ void cancelPopup();
+@@ -337,6 +338,7 @@
int progIndex; ///< Index of selected item index on page
QStringList titleList; ///< list of pages
ProgramMap progLists; ///< lists of programs by page
QStringList playList; ///< list of selected items "play list"
Index: mythtv/programs/mythfrontend/networkcontrol.cpp
===================================================================
---- mythtv/programs/mythfrontend/networkcontrol.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/programs/mythfrontend/networkcontrol.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/programs/mythfrontend/networkcontrol.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/programs/mythfrontend/networkcontrol.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -469,7 +469,7 @@
message = "NETWORK_CONTROL SEEK BACKWARD";
else if (tokens[2].contains(QRegExp("^\\d\\d:\\d\\d:\\d\\d$")))
message = QString("NETWORK_CONTROL SEEK POSITION %1")
Index: mythtv/programs/mythtranscode/mpeg2fix.cpp
===================================================================
---- mythtv/programs/mythtranscode/mpeg2fix.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/programs/mythtranscode/mpeg2fix.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/programs/mythtranscode/mpeg2fix.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/programs/mythtranscode/mpeg2fix.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -1776,6 +1776,7 @@
if (vFrame.count() && (file_end || vFrame.getLast()->isSequence))
}
Index: mythtv/programs/mythcommflag/main.cpp
===================================================================
---- mythtv/programs/mythcommflag/main.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/programs/mythcommflag/main.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/programs/mythcommflag/main.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/programs/mythcommflag/main.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -895,9 +895,6 @@
return COMMFLAG_EXIT_INVALID_CMDLINE;
}
}
Index: mythtv/programs/mythbackend/mainserver.cpp
===================================================================
---- mythtv/programs/mythbackend/mainserver.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/programs/mythbackend/mainserver.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/programs/mythbackend/mainserver.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/programs/mythbackend/mainserver.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -1919,11 +1919,8 @@
if (m_sched) {
if (table == "") m_sched->getAllPending(strList);
VERBOSE(VB_IMPORTANT, QString("Unknown command: %1").arg(command));
Index: mythtv/programs/mythbackend/scheduler.cpp
===================================================================
---- mythtv/programs/mythbackend/scheduler.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/programs/mythbackend/scheduler.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/programs/mythbackend/scheduler.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/programs/mythbackend/scheduler.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -35,8 +35,7 @@
#define LOC_ERR QString("Scheduler, Error: ")
"OR RECTABLE.type = %3 " // finddailyrecord
Index: mythtv/programs/mythbackend/housekeeper.cpp
===================================================================
---- mythtv/programs/mythbackend/housekeeper.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/programs/mythbackend/housekeeper.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/programs/mythbackend/housekeeper.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/programs/mythbackend/housekeeper.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -138,7 +138,6 @@
while (1)
Index: mythtv/programs/mythbackend/scheduler.h
===================================================================
---- mythtv/programs/mythbackend/scheduler.h (.../tags/release-0-19) (revision 10231)
-+++ mythtv/programs/mythbackend/scheduler.h (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/programs/mythbackend/scheduler.h (.../tags/release-0-19) (revision 10931)
++++ mythtv/programs/mythbackend/scheduler.h (.../branches/release-0-19-fixes) (revision 10931)
@@ -23,8 +23,7 @@
{
public:
void Reschedule(int recordid);
Index: mythtv/programs/mythbackend/filetransfer.cpp
===================================================================
---- mythtv/programs/mythbackend/filetransfer.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/programs/mythbackend/filetransfer.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/programs/mythbackend/filetransfer.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/programs/mythbackend/filetransfer.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -131,3 +131,9 @@
return size;
+
Index: mythtv/programs/mythbackend/autoexpire.cpp
===================================================================
---- mythtv/programs/mythbackend/autoexpire.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/programs/mythbackend/autoexpire.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/programs/mythbackend/autoexpire.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/programs/mythbackend/autoexpire.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -291,7 +291,8 @@
if ((availFreeKB = getDiskSpace(record_file_prefix, tKB, uKB)) < 0)
"Autoexpire Recording", msg);
Index: mythtv/programs/mythbackend/filetransfer.h
===================================================================
---- mythtv/programs/mythbackend/filetransfer.h (.../tags/release-0-19) (revision 10231)
-+++ mythtv/programs/mythbackend/filetransfer.h (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/programs/mythbackend/filetransfer.h (.../tags/release-0-19) (revision 10931)
++++ mythtv/programs/mythbackend/filetransfer.h (.../branches/release-0-19-fixes) (revision 10931)
@@ -35,6 +35,8 @@
long long GetFileSize(void);
QMutex readthreadLock;
Index: mythtv/programs/mythtv/main.cpp
===================================================================
---- mythtv/programs/mythtv/main.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/programs/mythtv/main.cpp (.../branches/release-0-19-fixes) (revision 10231)
-@@ -132,6 +132,7 @@
+--- mythtv/programs/mythtv/main.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/programs/mythtv/main.cpp (.../branches/release-0-19-fixes) (revision 10931)
+@@ -13,8 +13,6 @@
+ #include <iostream>
+ using namespace std;
+
+-MythContext *gContext;
+-
+ static void *run_priv_thread(void *data)
+ {
+ (void)data;
+@@ -102,6 +100,9 @@
+
+ gContext->LoadQtConfig();
+
++#if defined(Q_OS_MACX)
++ // Mac OS X doesn't define the AudioOutputDevice setting
++#else
+ QString auddevice = gContext->GetSetting("AudioOutputDevice");
+ if (auddevice == "" || auddevice == QString::null)
+ {
+@@ -109,6 +110,7 @@
+ "to run 'mythfrontend', not 'mythtv'.");
+ return TV_EXIT_NO_AUDIO;
+ }
++#endif
+
+ print_verbose_messages |= VB_PLAYBACK | VB_LIBAV;// | VB_AUDIO;
+
+@@ -132,6 +134,7 @@
ProgramInfo *pginfo = new ProgramInfo();
pginfo->endts = QDateTime::currentDateTime().addSecs(-180);
pginfo->pathname = filename;
}
Index: mythtv/programs/mythfilldatabase/filldata.cpp
===================================================================
---- mythtv/programs/mythfilldatabase/filldata.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/programs/mythfilldatabase/filldata.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/programs/mythfilldatabase/filldata.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/programs/mythfilldatabase/filldata.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -337,7 +337,7 @@
MSqlQuery query(MSqlQuery::InitCon());
VERBOSE(VB_IMPORTANT, "Data fetching complete.");
Index: mythtv/setup/backendsettings.cpp
===================================================================
---- mythtv/setup/backendsettings.cpp (.../tags/release-0-19) (revision 10231)
-+++ mythtv/setup/backendsettings.cpp (.../branches/release-0-19-fixes) (revision 10231)
+--- mythtv/setup/backendsettings.cpp (.../tags/release-0-19) (revision 10931)
++++ mythtv/setup/backendsettings.cpp (.../branches/release-0-19-fixes) (revision 10931)
@@ -1,6 +1,7 @@
#include <cstdio>
projects / packages / mythtv.git / commitdiff