Revision: 5418 Author: pebender Date: Fri Sep 4 17:53:37 2009 Log: - Updated package myth-trunk/mythstream.
http://code.google.com/p/minimyth/source/detail?r=5418 Added: /trunk/gar-minimyth/script/myth-trunk/mythstream/files/mythstream-mythtv-r21640-qt4_header.patch /trunk/gar-minimyth/script/myth-trunk/mythstream/files/mythstream-mythtv-r21640.patch.gar Deleted: /trunk/gar-minimyth/script/myth-trunk/mythstream/files/mythstream-0.18_qt4-fftw3f.patch /trunk/gar-minimyth/script/myth-trunk/mythstream/files/mythstream-0.18_qt4-gcc_warnings_fixes.patch /trunk/gar-minimyth/script/myth-trunk/mythstream/files/mythstream-0.18_qt4-mythtv_0_22.patch /trunk/gar-minimyth/script/myth-trunk/mythstream/files/mythstream-0.18_qt4-qt_bitblt_replace.patch /trunk/gar-minimyth/script/myth-trunk/mythstream/files/mythstream-0.18_qt4-qt_paintevent_fix.patch /trunk/gar-minimyth/script/myth-trunk/mythstream/files/mythstream-0.18_qt4-streams_res.patch /trunk/gar-minimyth/script/myth-trunk/mythstream/files/mythstream-0.18_qt4-user_agent_quicktime.patch /trunk/gar-minimyth/script/myth-trunk/mythstream/files/mythstream-0.18_qt4-youtube_parser_fix.patch /trunk/gar-minimyth/script/myth-trunk/mythstream/files/mythstream-0.18_qt4.patch.gar Modified: /trunk/gar-minimyth/html/minimyth/document-changelog.txt /trunk/gar-minimyth/script/myth-trunk/mythstream/Makefile /trunk/gar-minimyth/script/myth-trunk/mythstream/checksums ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/myth-trunk/mythstream/files/mythstream-mythtv-r21640-qt4_header.patch Fri Sep 4 17:53:37 2009 @@ -0,0 +1,12 @@ +diff -Naur mythstream_mythtv-r21640-old/libs/harvester.h mythstream_mythtv-r21640-new/libs/harvester.h +--- mythstream_mythtv-r21640-old/libs/harvester.h 2009-09-04 17:36:52.000000000 -0700 ++++ mythstream_mythtv-r21640-new/libs/harvester.h 2009-09-04 17:47:09.000000000 -0700 +@@ -23,7 +23,7 @@ + #include <q3process.h> + #include <qthread.h> + #include <q3process.h> +-#include <qhttp.h> ++#include <QtNetwork/qhttp.h> + #include <q3dict.h> + #include <qmap.h> + //Added by qt3to4: ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/myth-trunk/mythstream/files/mythstream-mythtv-r21640.patch.gar Fri Sep 4 17:53:37 2009 @@ -0,0 +1,25 @@ +diff -Naur mythstream_mythtv-r21640-old/settings.pro mythstream_mythtv-r21640-new/settings.pro +--- mythstream_mythtv-r21640-old/settings.pro 2009-09-02 15:07:04.000000000 -0700 ++++ mythstream_mythtv-r21640-new/settings.pro 2009-09-04 17:37:28.000000000 -0700 +@@ -7,11 +7,11 @@ + isEmpty( PREFIX ) { + # Install in /usr/share/... or /usr/local/share/... ? + #PREFIX = /usr/local +- PREFIX = /usr ++ PREFIX = @GAR_DESTDIR@@GAR_prefix@ + } + # Where the binaries actually locate the assets/filters/plugins at runtime + isEmpty( RUNPREFIX ) { +- RUNPREFIX = $$PREFIX ++ RUNPREFIX = @GAR_prefix@ + } + + INCLUDEPATH += $${PREFIX}/include +@@ -31,7 +31,3 @@ + QMAKE_LFLAGS -= -Wl,--no-undefined + #QMAKE_LFLAGS -= --no-undefined + QMAKE LFLAGS += -DQT_THREAD_SUPPORT +- +-release { +- QMAKE_CXXFLAGS_RELEASE = -O2 -fomit-frame-pointer +-} ======================================= --- /trunk/gar-minimyth/script/myth-trunk/mythstream/files/mythstream-0.18_qt4-fftw3f.patch Tue Apr 8 15:28:17 2008 +++ /dev/null @@ -1,116 +0,0 @@ -diff -Naur mythstream-0.18_qt4-old/INSTALL mythstream-0.18_qt4-new/INSTALL ---- mythstream-0.18_qt4-old/INSTALL 2008-04-08 14:06:36.000000000 -0700 -+++ mythstream-0.18_qt4-new/INSTALL 2008-04-08 14:09:15.000000000 -0700 -@@ -77,11 +77,9 @@ - xfree86-devel. On Debian Lenny: libqt3-mt-dev, libqt4-dev, libfreetype-dev, - libfontconfig1, libpng12-dev, xlibs-dev, libx11-dev (see MythTV docs). - -- In addition, you'll need fftw2 (not fftw3) packages. On most distributions -- installing fftw devel or fftw2 devel packages will do. -- On Suse you will have to compile fftw yourself because Suse provides double -- precision fftw (dfftw) packages. You can download the fftw source from -- http://www.fftw.org/download.html (sept 2004: version 2.1.5). -+ In addition, you'll need fftw3 fftw2) packages. On most distributions -+ installing fftw devel or fftw3 devel packages will do. You can download the fftw -+ source from http://www.fftw.org/download.html (sept 2004: version 2.1.5). - - NOTE: MythStream uses MythTV libraries. If you have a binary MythTV install, - download the mythtv development package (Debian: libmyth-[version]-dev). When -diff -Naur mythstream-0.18_qt4-old/libs/fft.cpp mythstream-0.18_qt4-new/libs/fft.cpp ---- mythstream-0.18_qt4-old/libs/fft.cpp 2008-04-08 14:06:36.000000000 -0700 -+++ mythstream-0.18_qt4-new/libs/fft.cpp 2008-04-08 14:09:15.000000000 -0700 -@@ -155,7 +155,7 @@ - { - unloadSampler(); - if (plan) -- fftw_destroy_plan(plan); -+ fftwf_destroy_plan(plan); - free(in); - free(out); - } -@@ -221,17 +221,17 @@ - for (int i = 0; i < sampleWindow; i++) - { - // samples are windowed -- c_re( in[i] ) = (int) ( lbuf[i] * sin(drad*i) ); -- //c_re( in[i] ) = 32000 - (i%2)*64000 ; -- c_im( in[i] ) = 0; -+ in[i][0] = (int) ( lbuf[i] * sin(drad*i) ); -+ //in[i][0] = 32000 - (i%2)*64000 ; -+ in[i][1] = 0; - } - - // should use real fft... -- fftw(plan, 1, in, 1, 0, out, 1, 0); -+ fftwf_execute(plan); - - // remove DC offset -- c_re(out[0]) = 0; -- c_im(out[0]) = 0; -+ out[0][0] = 0; -+ out[0][1] = 0; - - // display x-scale: start linear, handover to log function - int fftPoint = 0; // display x-axis -@@ -252,8 +252,8 @@ - - for (int i = 0; i < nfreq; i++) - { -- re = c_re(out[i+1]) / sampleWindow; -- im = c_im(out[i+1]) / sampleWindow; -+ re = out[i+1][0] / sampleWindow; -+ im = out[i+1][1] / sampleWindow; - - // lin and log display pos: - linPos = linCoeff*i; -@@ -309,10 +309,10 @@ - - void FFTConverter::init() - { -- in = (FFTW_COMPLEX*)malloc(sampleWindow * sizeof(FFTW_COMPLEX)); -- out = (FFTW_COMPLEX*)malloc(sampleWindow * sizeof(FFTW_COMPLEX)); -+ in = (fftwf_complex*)malloc(sampleWindow * sizeof(fftwf_complex)); -+ out = (fftwf_complex*)malloc(sampleWindow * sizeof(fftwf_complex)); - -- plan = fftw_create_plan(sampleWindow, FFTW_FORWARD, FFTW_MEASURE); -+ plan = fftwf_plan_dft_1d(sampleWindow, in, out, FFTW_FORWARD, FFTW_MEASURE); - if (plan == NULL) - { - cerr << "FFTConverter: Error creating fft plan" << endl; -diff -Naur mythstream-0.18_qt4-old/libs/fft.h mythstream-0.18_qt4-new/libs/fft.h ---- mythstream-0.18_qt4-old/libs/fft.h 2008-04-08 14:06:36.000000000 -0700 -+++ mythstream-0.18_qt4-new/libs/fft.h 2008-04-08 14:09:15.000000000 -0700 -@@ -32,7 +32,7 @@ - #include <sys/stat.h> - #include <fcntl.h> - #include <ctype.h> --#include <fftw.h> -+#include <fftw3.h> - #include <stdlib.h> - #include <qthread.h> - -@@ -121,9 +121,9 @@ - int processIndex; // spectrum queue index to process - int displayIndex; // signalled spectrum index to display - -- FFTW_COMPLEX *in; -- FFTW_COMPLEX *out; -- fftw_plan plan; -+ fftwf_complex *in; -+ fftwf_complex *out; -+ fftwf_plan plan; - - void init(); - -diff -Naur mythstream-0.18_qt4-old/mythstream/mythstream.pro mythstream-0.18_qt4-new/mythstream/mythstream.pro ---- mythstream-0.18_qt4-old/mythstream/mythstream.pro 2008-04-08 14:06:36.000000000 -0700 -+++ mythstream-0.18_qt4-new/mythstream/mythstream.pro 2008-04-08 14:09:15.000000000 -0700 -@@ -13,7 +13,7 @@ - - target.path = $${PREFIX}/lib/mythtv/plugins - INSTALLS += target --LIBS += -lfftw -+LIBS += -lfftw3f - - DEFINES += MYTHTV - ======================================= --- /trunk/gar-minimyth/script/myth-trunk/mythstream/files/mythstream-0.18_qt4-gcc_warnings_fixes.patch Sat Aug 15 01:52:33 2009 +++ /dev/null @@ -1,360 +0,0 @@ -diff -Naur mythstream-0.18_qt4-old/libs/configelements.cpp mythstream-0.18_qt4-new/libs/configelements.cpp ---- mythstream-0.18_qt4-old/libs/configelements.cpp 2008-04-07 14:14:56.000000000 -0700 -+++ mythstream-0.18_qt4-new/libs/configelements.cpp 2009-08-15 01:23:16.000000000 -0700 -@@ -80,7 +80,7 @@ - - // ------------------- Edit group box -------------------- - --EditGroup::EditGroup(char* title, QWidget* parent) : Q3VGroupBox(title, parent) -+EditGroup::EditGroup(const char* title, QWidget* parent) : Q3VGroupBox(title, parent) - { - myParent = parent; - setPalette(parent->palette()); -diff -Naur mythstream-0.18_qt4-old/libs/configelements.h mythstream-0.18_qt4-new/libs/configelements.h ---- mythstream-0.18_qt4-old/libs/configelements.h 2008-04-07 04:17:57.000000000 -0700 -+++ mythstream-0.18_qt4-new/libs/configelements.h 2009-08-15 01:31:47.000000000 -0700 -@@ -80,9 +80,9 @@ - static const int r_web_pass = 5; - - // storage value count -- static const unsigned int r_count_file = 4; -- static const unsigned int r_count_db = 9; -- static const unsigned int r_count_web = 6; -+ static const int r_count_file = 4; -+ static const int r_count_db = 9; -+ static const int r_count_web = 6; - - // stream value indexes - static const unsigned int s_folder = 0; -@@ -194,7 +194,7 @@ - idle - }; - -- EditGroup(char* title, QWidget* parent); -+ EditGroup(const char* title, QWidget* parent); - ~EditGroup(); - - void buildGroup(int boxes); -diff -Naur mythstream-0.18_qt4-old/libs/harvester.cpp mythstream-0.18_qt4-new/libs/harvester.cpp ---- mythstream-0.18_qt4-old/libs/harvester.cpp 2008-04-07 15:23:50.000000000 -0700 -+++ mythstream-0.18_qt4-new/libs/harvester.cpp 2009-08-15 01:38:55.000000000 -0700 -@@ -269,7 +269,7 @@ - QString currentDir = directory; - bool pathCreated = true; - -- for ( uint i = 0; i < pathElements.size() - 1; i++ ) // assume last entry is file -+ for ( int i = 0; i < pathElements.size() - 1; i++ ) // assume last entry is file - { - currentDir += "/" + *pathElements.at(i); - //cout << "create: " << currentDir << endl; -@@ -682,7 +682,7 @@ - - QStringList cookieParts = QStringList::split( "; ", cookieMap[host] ); - -- uint i = 0; -+ int i = 0; - bool processed = false; - - while ( i < cookieParts.size() && !processed ) -@@ -870,7 +870,7 @@ - QStringList cookieRawList = QStringList::split("&&COOKIESEP&&", cookieData); - - // feed every cookie to cookieBin -- for (uint i = 0; i < cookieRawList.size(); i++) -+ for (int i = 0; i < cookieRawList.size(); i++) - cookieBin.updateCookie( host, cookieRawList[i] ); - } - -@@ -1564,6 +1564,8 @@ - eParser->addArgument( "\"" + sourceUrl + "\"" ); // change - eParser->addArgument( "\"" + srcName + "\"" ); // change - break; -+ case NONE: -+ break; - } - - -@@ -1795,7 +1797,7 @@ - eParserUrl->url = url; - //cout << "found name: " << name << ", handler: " << handl << endl; - // process meta information -- for (uint i = 0; i<lMeta.count(); i++) -+ for (int i = 0; i<lMeta.count(); i++) - { - nMeta = lMeta.item(i); - metaName = ""; -@@ -1967,6 +1969,8 @@ - eParser->addArgument( "\"" + identString + "\"" ); // change - //cout << "PERL PARSER" << endl; - break; -+ case NONE: -+ break; - } - - connect( eParser, SIGNAL(readyReadStdout()), -diff -Naur mythstream-0.18_qt4-old/libs/playerencap.cpp mythstream-0.18_qt4-new/libs/playerencap.cpp ---- mythstream-0.18_qt4-old/libs/playerencap.cpp 2008-04-07 14:14:56.000000000 -0700 -+++ mythstream-0.18_qt4-new/libs/playerencap.cpp 2009-08-15 01:38:40.000000000 -0700 -@@ -347,7 +347,7 @@ - QDomNodeList proplist; - - QDomNodeList list = parentNode.childNodes(); -- for (unsigned int i = 0; i < list.count(); i++) -+ for (int i = 0; i < list.count(); i++) - { - item = list.item(i); - label = item.namedItem(QString("label")).toElement().text(); -@@ -383,7 +383,7 @@ - if ( !props.isNull() ) - { - proplist = props.childNodes(); -- for (unsigned int j = 0; j < proplist.count(); j++) -+ for (int j = 0; j < proplist.count(); j++) - { - item = proplist.item(j); - name = item.namedItem(QString("name")).toElement().text(); -@@ -421,7 +421,7 @@ - QString name, value; - - QDomNodeList list = parentNode.childNodes(); -- for (unsigned int i = 0; i < list.count(); i++) -+ for (int i = 0; i < list.count(); i++) - { - item = list.item(i); - name = item.namedItem(QString("name")).toElement().text(); -diff -Naur mythstream-0.18_qt4-old/libs/storageconfig.cpp mythstream-0.18_qt4-new/libs/storageconfig.cpp ---- mythstream-0.18_qt4-old/libs/storageconfig.cpp 2008-04-07 14:14:56.000000000 -0700 -+++ mythstream-0.18_qt4-new/libs/storageconfig.cpp 2009-08-15 01:33:45.000000000 -0700 -@@ -44,7 +44,7 @@ - { - - public: -- StorageEditGroup(char* title, StorageConfig* parent) : EditGroup(title, parent) -+ StorageEditGroup(const char* title, StorageConfig* parent) : EditGroup(title, parent) - { - boxAddTitle = "Add storage"; - boxEditTitle = "Edit storage"; -@@ -383,7 +383,7 @@ - item->setText(1, rec->values[1]); - item->setText(2, rec->values[0]); - -- for ( unsigned int i = 0; i < rec->values.count(); i++ ) -+ for ( int i = 0; i < rec->values.count(); i++ ) - item->values.append(rec->values[i]); - - if (item->values.size() < 9 ) item->values.resize( 9, "" ); -@@ -417,7 +417,7 @@ - repos->setText(1, rec->values[1]); - repos->setText(2, rec->values[0]); - -- for ( unsigned int i = 0; i < rec->values.count(); i++ ) -+ for ( int i = 0; i < rec->values.count(); i++ ) - repos->values[i] = rec->values[i]; - - m_storageList->setSelected( repos, true ); -diff -Naur mythstream-0.18_qt4-old/libs/storagehandlers.cpp mythstream-0.18_qt4-new/libs/storagehandlers.cpp ---- mythstream-0.18_qt4-old/libs/storagehandlers.cpp 2008-04-07 14:14:56.000000000 -0700 -+++ mythstream-0.18_qt4-new/libs/storagehandlers.cpp 2009-08-15 01:28:05.000000000 -0700 -@@ -58,7 +58,7 @@ - { - error = false; - -- for (unsigned int i=0; i<values.count(); i++) -+ for (int i=0; i<values.count(); i++) - { - values[i] = ""; - oldValues[i] = ""; -diff -Naur mythstream-0.18_qt4-old/libs/streambrowser.cpp mythstream-0.18_qt4-new/libs/streambrowser.cpp ---- mythstream-0.18_qt4-old/libs/streambrowser.cpp 2008-04-07 15:09:09.000000000 -0700 -+++ mythstream-0.18_qt4-new/libs/streambrowser.cpp 2009-08-15 01:34:49.000000000 -0700 -@@ -1353,7 +1353,7 @@ - item->setPrefix(prefix); - item->setAction(none); - -- for (uint i = 0; i < meta.size(); i++) -+ for (int i = 0; i < meta.size(); i++) - { - metaparts = QStringList::split("(stsep)", - meta.at(i), true); -@@ -2201,7 +2201,7 @@ - { - cerr << "stream properties mismatch (received " << values.count() - << " out of 5):" << endl; -- for (uint i = 0; i<values.count(); i++) -+ for (int i = 0; i<values.count(); i++) - cerr << "prop" << i << ": " << values[i].latin1() << endl; - error = true; - } -@@ -2265,10 +2265,12 @@ - checkAndSetIcon(item); - // give *-prefix when item is inserted in the recording folder by recorder - if ( folder->getName() == "recordings" ) -+ { - if ( rec->ident == ident_recorder ) - item->setPrefix("R"); - else - item->setPrefix("#"); -+ } - - emit eventValuesUpdated( folderlist ); - -diff -Naur mythstream-0.18_qt4-old/libs/streamconfig.cpp mythstream-0.18_qt4-new/libs/streamconfig.cpp ---- mythstream-0.18_qt4-old/libs/streamconfig.cpp 2008-04-07 14:14:56.000000000 -0700 -+++ mythstream-0.18_qt4-new/libs/streamconfig.cpp 2009-08-15 01:23:16.000000000 -0700 -@@ -59,7 +59,7 @@ - - // ------------------- Storage Select group box -------------------- - --MStorageGroup::MStorageGroup(char* title, QWidget* parent, ReposStorage *storageStorage, -+MStorageGroup::MStorageGroup(const char* title, QWidget* parent, ReposStorage *storageStorage, - StreamStorage *streamStorage) : Q3VGroupBox(title, parent) - { - myParent = parent; -@@ -354,35 +354,39 @@ - newStorage = storages->getStorageValuesByName( values, streams->getStorageName() ); - - if ( activeStorage != streams->getStorageName() ) -- if ( oldStorage ) - { -- //cout << "found old: " << activeStorage << endl; -- -- newValues = oldStorageValues; -- newValues[r_selected] = "-"; -- -- // condition should not fail -- if ( oldStorageValues[r_selected] != "-" ) -- if ( !storages->updateRecord(ident_storagegroup, oldStorageValues, newValues, err) ) -- reportMessage(err, true); -+ if ( oldStorage ) -+ { -+ //cout << "found old: " << activeStorage << endl; -+ -+ newValues = oldStorageValues; -+ newValues[r_selected] = "-"; -+ -+ // condition should not fail -+ if ( oldStorageValues[r_selected] != "-" ) -+ if ( !storages->updateRecord(ident_storagegroup, oldStorageValues, newValues, err) ) -+ reportMessage(err, true); -+ } -+ else -+ cerr << "warning: unknown previous connected storage" << endl; - } -- else -- cerr << "warning: unknown previous connected storage" << endl; - - - if ( activeStorage != streams->getStorageName() ) -- if ( newStorage ) - { -- // cout << "found new: " << streams->getStorageName() << endl; -- -- newValues = values; -- newValues[r_selected] = "*"; -- if ( values[r_selected] != "*" ) -- if ( !storages->updateRecord(ident_storagegroup, values, newValues, err) ) -- reportMessage(err, true); -+ if ( newStorage ) -+ { -+ // cout << "found new: " << streams->getStorageName() << endl; -+ -+ newValues = values; -+ newValues[r_selected] = "*"; -+ if ( values[r_selected] != "*" ) -+ if ( !storages->updateRecord(ident_storagegroup, values, newValues, err) ) -+ reportMessage(err, true); -+ } -+ else -+ cerr << "error: unknown previous connected storage" << endl; - } -- else -- cerr << "error: unknown previous connected storage" << endl; - - synchronized(false); - -@@ -424,7 +428,7 @@ - { - - public: -- StreamEditGroup(char* title, StreamConfig* parent) : EditGroup(title, parent) -+ StreamEditGroup(const char* title, StreamConfig* parent) : EditGroup(title, parent) - { - boxAddTitle = "Add stream"; - boxEditTitle = "Edit stream"; -@@ -500,7 +504,7 @@ - edit4 = getLineEdit("edit3"); - edit5 = getLineEdit("edit4"); - -- if ( status == add | status == idle ) -+ if ( (status == add) | (status == idle) ) - { - streamConfig->createStation(edit1->text(), edit2->text(), - edit3->text(), edit4->text(), edit5->text()); -diff -Naur mythstream-0.18_qt4-old/libs/streamconfig.h mythstream-0.18_qt4-new/libs/streamconfig.h ---- mythstream-0.18_qt4-old/libs/streamconfig.h 2008-04-07 04:17:57.000000000 -0700 -+++ mythstream-0.18_qt4-new/libs/streamconfig.h 2009-08-15 01:23:16.000000000 -0700 -@@ -62,7 +62,7 @@ - Q_OBJECT - - public: -- MStorageGroup(char* title, QWidget* parent, ReposStorage *storageStorage, StreamStorage *streamStorage); -+ MStorageGroup(const char* title, QWidget* parent, ReposStorage *storageStorage, StreamStorage *streamStorage); - ~MStorageGroup(); - - public slots: -diff -Naur mythstream-0.18_qt4-old/libs/streamstatus.cpp mythstream-0.18_qt4-new/libs/streamstatus.cpp ---- mythstream-0.18_qt4-old/libs/streamstatus.cpp 2008-04-07 14:14:56.000000000 -0700 -+++ mythstream-0.18_qt4-new/libs/streamstatus.cpp 2009-08-15 01:23:16.000000000 -0700 -@@ -911,7 +911,7 @@ - delete proc; - proc = NULL; - -- if ( getStatus() == starting | getStatus() == buffering ) -+ if ( (getStatus() == starting) | (getStatus() == buffering) ) - setStatus(nostream); // nothing to play,pause or videoinit = no stream - else - setStatus(stopped); -diff -Naur mythstream-0.18_qt4-old/mythstream/mythstream.cpp mythstream-0.18_qt4-new/mythstream/mythstream.cpp ---- mythstream-0.18_qt4-old/mythstream/mythstream.cpp 2008-04-07 14:14:56.000000000 -0700 -+++ mythstream-0.18_qt4-new/mythstream/mythstream.cpp 2009-08-15 01:41:53.000000000 -0700 -@@ -227,11 +227,13 @@ - if (displayResetDelay != -1 && --displayResetDelay == 0) - { - if (streamStatus == "playing" || streamStatus == "buffering" ) -+ { - if (playingVideo) - displayStatus = video; - else - displayStatus = audio; - -+ } - if (streamStatus == "idle") - { - displayStatus = browse; -@@ -984,11 +986,13 @@ - } - else if ( name.left(6) == "button" ) - { -- if( (layerSet = m_Theme->GetSet("audio_panel")) -- && (button = (UITextButtonType *)layerSet->GetType(name)) ) -+ if ( (layerSet = m_Theme->GetSet("audio_panel")) ) - { -- button->setText(value); -- if (!button->isShown() ) button->show(); -+ if ( (button = (UITextButtonType *)layerSet->GetType(name)) ) -+ { -+ button->setText(value); -+ if (!button->isShown() ) button->show(); -+ } - } - } - else if (type == "command") -@@ -1256,7 +1260,7 @@ - - gContext->GetMainWindow()->TranslateKeyPress("Stream", e, actions); - -- for (unsigned int i = 0; i < actions.size() && !handled; i++) -+ for (int i = 0; i < actions.size() && !handled; i++) - { - QString action = actions[i]; - QString browserAction = ""; ======================================= --- /trunk/gar-minimyth/script/myth-trunk/mythstream/files/mythstream-0.18_qt4-mythtv_0_22.patch Tue Aug 11 18:20:44 2009 +++ /dev/null @@ -1,426 +0,0 @@ -diff -Naur mythstream-0.18_qt4-old/libs/configelements.cpp mythstream-0.18_qt4-new/libs/configelements.cpp ---- mythstream-0.18_qt4-old/libs/configelements.cpp 2008-04-07 14:14:56.000000000 -0700 -+++ mythstream-0.18_qt4-new/libs/configelements.cpp 2009-08-11 16:20:39.000000000 -0700 -@@ -110,7 +110,7 @@ - lab->setMaximumHeight(maxHeight); - tmp = new MyLineEdit(this, "edit" + QString::number(i)); - #ifdef MYTHTV -- tmp->setPopupPosition(VK_POSTOPDIALOG); -+ tmp->setPopupPosition(VKQT_POSTOPDIALOG); - #endif - } - -diff -Naur mythstream-0.18_qt4-old/libs/configelements.h mythstream-0.18_qt4-new/libs/configelements.h ---- mythstream-0.18_qt4-old/libs/configelements.h 2008-04-07 04:17:57.000000000 -0700 -+++ mythstream-0.18_qt4-new/libs/configelements.h 2009-08-11 16:20:39.000000000 -0700 -@@ -30,7 +30,7 @@ - - #ifdef MYTHTV - #include <mythtv/mythwidgets.h> --#include <mythtv/virtualkeyboard.h> -+#include <mythtv/virtualkeyboard_qt.h> - #else - #include <qlineedit.h> - #endif -diff -Naur mythstream-0.18_qt4-old/libs/recorder.cpp mythstream-0.18_qt4-new/libs/recorder.cpp ---- mythstream-0.18_qt4-old/libs/recorder.cpp 2008-04-07 14:14:56.000000000 -0700 -+++ mythstream-0.18_qt4-new/libs/recorder.cpp 2009-08-11 16:20:39.000000000 -0700 -@@ -112,7 +112,7 @@ - if (recList.count() != 0) // no storage event should occur during recording - cerr << "TARGET warning: storage manipulation during recording" << endl; - -- if (eventType == Storage::loaded) -+ if (eventType == MStorage::loaded) - { - if (recList.count() != 0) // no storage event should occur during recording - stopAllRecordings(); -diff -Naur mythstream-0.18_qt4-old/libs/storage.cpp mythstream-0.18_qt4-new/libs/storage.cpp ---- mythstream-0.18_qt4-old/libs/storage.cpp 2008-04-07 14:14:56.000000000 -0700 -+++ mythstream-0.18_qt4-new/libs/storage.cpp 2009-08-11 16:20:39.000000000 -0700 -@@ -37,9 +37,9 @@ - using namespace std; - - --//----------------------- Storage --------------------------- -+//----------------------- MStorage --------------------------- - --Storage::Storage(QString table, QString name, -+MStorage::MStorage(QString table, QString name, - int key_pri, int key_mul1, int key_mul2) : QObject() - { - currentStorage = 0; -@@ -53,7 +53,7 @@ - this->key_mul2 = key_mul2; - } - --Storage::~Storage() -+MStorage::~MStorage() - { - if (currentStorage) - delete currentStorage; -@@ -62,7 +62,7 @@ - } - - --bool Storage::storageReadOnly() -+bool MStorage::storageReadOnly() - { - if (currentStorage) - return currentStorage->storageReadOnly(); -@@ -70,7 +70,7 @@ - return false; - } - --QString Storage::getStorageDescription() -+QString MStorage::getStorageDescription() - { - if (currentStorage) - return currentStorage->getStorageDescription(); -@@ -78,7 +78,7 @@ - return "TARGET storage warning: no storage selected"; - } - --Storage::AccessType Storage::getAccessType() -+MStorage::AccessType MStorage::getAccessType() - { - if (currentStorage) - return (AccessType)currentStorage->getAccessType(); -@@ -86,7 +86,7 @@ - return none; - } - --QString Storage::getStorageName() -+QString MStorage::getStorageName() - { - if (currentStorage) - return currentStorage->getStorageName(); -@@ -94,7 +94,7 @@ - return "warning: no storage selected"; - } - --bool Storage::getSynchronized() -+bool MStorage::getSynchronized() - { - if (currentStorage) - return currentStorage->getSynchronized(); -@@ -102,7 +102,7 @@ - return false; - } - --QString Storage::getLastError() -+QString MStorage::getLastError() - { - if (currentStorage) - return currentStorage->getLastError(); -@@ -110,13 +110,13 @@ - return ""; - } - --void Storage::resetRecordList() -+void MStorage::resetRecordList() - { - if (currentStorage) - currentStorage->resetRecordList(); - } - --bool Storage::getNextRecord(ValueList& values) -+bool MStorage::getNextRecord(ValueList& values) - { - if (currentStorage) - return currentStorage->getNextRecord(currentStorage->getListHandler(), values); -@@ -124,7 +124,7 @@ - return false; - } - --void Storage::linkNewStorage(GenStorage *storage) -+void MStorage::linkNewStorage(GenStorage *storage) - { - currentStorage = storage; - -@@ -158,7 +158,7 @@ - - } - --bool Storage::selectDbStorage(int ident, QString name, QString dbDriver, -+bool MStorage::selectDbStorage(int ident, QString name, QString dbDriver, - QString hostName, unsigned int port, QString dbName, QString table, - QString login, QString password) - { -@@ -175,7 +175,7 @@ - } - - #ifdef MYTHTV --bool Storage::selectDefaultDb(int ident) -+bool MStorage::selectDefaultDb(int ident) - { - if (oldStorage) delete oldStorage; - oldStorage = currentStorage; -@@ -189,7 +189,7 @@ - } - #endif - --bool Storage::selectFileStorage(int ident, QString name, QString fileName) -+bool MStorage::selectFileStorage(int ident, QString name, QString fileName) - { - if (oldStorage) delete oldStorage; - oldStorage = currentStorage; -@@ -202,7 +202,7 @@ - return fileStorage->openFileStorage(ident, fileName); - } - --void Storage::selectWebStorage(int ident, QString name, QString url, QString login, QString password) -+void MStorage::selectWebStorage(int ident, QString name, QString url, QString login, QString password) - { - - if (oldStorage) delete oldStorage; -@@ -217,7 +217,7 @@ - } - - --bool Storage::loadList(int ident, QString& error) -+bool MStorage::loadList(int ident, QString& error) - { - if (currentStorage) - { -@@ -238,7 +238,7 @@ - - // - copy from resource1 to resource2 - // - update file resource after removal --bool Storage::storeList(int ident, QString& error) -+bool MStorage::storeList(int ident, QString& error) - { - if (!currentStorage) - { -@@ -255,7 +255,7 @@ - return currentStorage->storeList(ident, oldStorage->getListHandler(), error); - } - --bool Storage::insertRecord(int ident, ValueList& values, QString& error) -+bool MStorage::insertRecord(int ident, ValueList& values, QString& error) - { - if (currentStorage) - return currentStorage->insertRecord(ident, values, error); -@@ -266,7 +266,7 @@ - } - } - --bool Storage::updateRecord(int ident, ValueList& oldValues, ValueList& values, QString& error) -+bool MStorage::updateRecord(int ident, ValueList& oldValues, ValueList& values, QString& error) - { - - if (currentStorage) -@@ -278,7 +278,7 @@ - } - } - --bool Storage::removeRecord(int ident, ValueList values, QString& error) -+bool MStorage::removeRecord(int ident, ValueList values, QString& error) - { - if (currentStorage) - return currentStorage->removeRecord(ident, values, error); -diff -Naur mythstream-0.18_qt4-old/libs/storage.h mythstream-0.18_qt4-new/libs/storage.h ---- mythstream-0.18_qt4-old/libs/storage.h 2008-04-07 04:17:57.000000000 -0700 -+++ mythstream-0.18_qt4-new/libs/storage.h 2009-08-11 16:20:39.000000000 -0700 -@@ -37,7 +37,9 @@ - /* - Absolutely NOT thread safe - -- Storage constraints: -+ Storage has been renamed to MStorage: it conflicted with new mythtv class Storage -+ -+ MStorage constraints: - 1) url is unique - 2) (folder, name) is unique - -@@ -53,7 +55,7 @@ - -> In case of file storage: selectFileStorage + removeRecord + storeList compacts file - */ - --class Storage : public QObject -+class MStorage : public QObject - { - Q_OBJECT - -@@ -74,9 +76,9 @@ - saved - }; - -- Storage(QString table = "", QString name = "", -+ MStorage(QString table = "", QString name = "", - int key_pri = 2, int key_mul1 = 0, int key_mul2 = 1); -- ~Storage(); -+ ~MStorage(); - - // select storage resource (without reading records) - #ifdef MYTHTV -diff -Naur mythstream-0.18_qt4-old/libs/streamstorage.cpp mythstream-0.18_qt4-new/libs/streamstorage.cpp ---- mythstream-0.18_qt4-old/libs/streamstorage.cpp 2008-04-07 14:14:56.000000000 -0700 -+++ mythstream-0.18_qt4-new/libs/streamstorage.cpp 2009-08-11 16:20:39.000000000 -0700 -@@ -326,7 +326,7 @@ - return (values.count() >= r_count_file && values[r_name] == storageName); - } - --ReposStorage::ReposStorage() : Storage("", "", 2, 2, 2) -+ReposStorage::ReposStorage() : MStorage("", "", 2, 2, 2) - { - QString error; - QString source; -diff -Naur mythstream-0.18_qt4-old/libs/streamstorage.h mythstream-0.18_qt4-new/libs/streamstorage.h ---- mythstream-0.18_qt4-old/libs/streamstorage.h 2008-04-07 04:17:57.000000000 -0700 -+++ mythstream-0.18_qt4-new/libs/streamstorage.h 2009-08-11 16:20:39.000000000 -0700 -@@ -36,15 +36,15 @@ - - // Open reposstorage first: it creates default files on first run - --class StreamStorage : public Storage -+class StreamStorage : public MStorage - { - public: -- StreamStorage(QString table = "", QString name = "") : Storage(table, name) {} -+ StreamStorage(QString table = "", QString name = "") : MStorage(table, name) {} - - bool selectStorage(int ident, ValueList& values); - }; - --class ReposStorage : public Storage -+class ReposStorage : public MStorage - { - public: - ReposStorage(); -diff -Naur mythstream-0.18_qt4-old/libs/x11win.cpp mythstream-0.18_qt4-new/libs/x11win.cpp ---- mythstream-0.18_qt4-old/libs/x11win.cpp 2008-04-07 14:14:56.000000000 -0700 -+++ mythstream-0.18_qt4-new/libs/x11win.cpp 2009-08-11 18:17:05.000000000 -0700 -@@ -1,26 +1,28 @@ - - #include <iostream> - #include <X11/Xlib.h> -+#ifdef CursorShape -+#undef CursorShape // defined as a constant in X11/X.h and used as an enum in QtGui/qcursor.h. -+#endif -+#include <QX11Info> - - - using namespace std; - - //extern void handleExposeEvent(); - --Display* qt_xdisplay (void); -- - void myX11MapWindow (uint id) - { - //cout << "mapping" << endl; -- XMapWindow (qt_xdisplay(), id); -- XFlush (qt_xdisplay()); -+ XMapWindow (QX11Info::display(), id); -+ XFlush (QX11Info::display()); - } - - void myX11UnmapWindow (uint id) - { - // cout << "unmapping" << endl; -- XUnmapWindow (qt_xdisplay(), id); -- XFlush (qt_xdisplay()); -+ XUnmapWindow (QX11Info::display(), id); -+ XFlush (QX11Info::display()); - } - - -@@ -28,7 +30,7 @@ - { - uint res; - -- res = XGrabKeyboard(qt_xdisplay(), id, true, GrabModeAsync, GrabModeAsync, CurrentTime); -+ res = XGrabKeyboard(QX11Info::display(), id, true, GrabModeAsync, GrabModeAsync, CurrentTime); - - switch (res) - { -@@ -43,7 +45,7 @@ - - void myX11UngrabKeyboard() - { -- XUngrabKeyboard(qt_xdisplay(), CurrentTime); -+ XUngrabKeyboard(QX11Info::display(), CurrentTime); - } - - /* -diff -Naur mythstream-0.18_qt4-old/mythstream/main.cpp mythstream-0.18_qt4-new/mythstream/main.cpp ---- mythstream-0.18_qt4-old/mythstream/main.cpp 2008-04-07 14:14:56.000000000 -0700 -+++ mythstream-0.18_qt4-new/mythstream/main.cpp 2009-08-11 16:20:39.000000000 -0700 -@@ -32,11 +32,12 @@ - #include "../libs/streamconfig.h" - #include "../libs/storageconfig.h" - --#include <mythtv/mythcontext.h> - #include <mythtv/mythdialogs.h> - #include <mythtv/mythmedia.h> - #include <mythtv/mythplugin.h> -+#include <mythtv/libmythdb/mythversion.h> - #include <mythtv/libmythui/myththemedmenu.h> -+#include <mythtv/libmythui/mythuihelper.h> - - using namespace std; - -@@ -147,10 +148,10 @@ - - void runStream(void) - { -- gContext->addCurrentLocation("mythstream"); -+ GetMythUI()->AddCurrentLocation("mythstream"); - MythStream stream(gContext->GetMainWindow(), "stream"); - stream.exec(); -- gContext->removeCurrentLocation( ); -+ GetMythUI()->RemoveCurrentLocation( ); - } - - int mythplugin_run(void) -@@ -162,7 +163,7 @@ - - int mythplugin_config(void) - { -- QString themedir = gContext->GetThemeDir( ); -+ QString themedir = GetMythUI()->GetThemeDir( ); - runMenu( themedir, "streamconfigmenu.xml"); - return 0; - } -diff -Naur mythstream-0.18_qt4-old/mythstream.pro mythstream-0.18_qt4-new/mythstream.pro ---- mythstream-0.18_qt4-old/mythstream.pro 2008-04-07 05:28:59.000000000 -0700 -+++ mythstream-0.18_qt4-new/mythstream.pro 2009-08-11 18:05:27.000000000 -0700 -@@ -3,4 +3,3 @@ - # Directories - SUBDIRS = mythstream - #SUBDIRS = mythstream alt_parsers -- -diff -Naur mythstream-0.18_qt4-old/settings.pro mythstream-0.18_qt4-new/settings.pro ---- mythstream-0.18_qt4-old/settings.pro 2008-04-07 15:40:18.000000000 -0700 -+++ mythstream-0.18_qt4-new/settings.pro 2009-08-11 16:20:39.000000000 -0700 -@@ -3,15 +3,26 @@ - - VERSION=0.18_2 - --# Install in /usr/share/... or /usr/local/share/... ? --#PREFIX = /usr/local --PREFIX = /usr -+# Where binaries, includes and runtime assets are installed by 'make install' -+isEmpty( PREFIX ) { -+ # Install in /usr/share/... or /usr/local/share/... ? -+ #PREFIX = /usr/local -+ PREFIX = /usr -+} -+# Where the binaries actually locate the assets/filters/plugins at runtime -+isEmpty( RUNPREFIX ) { -+ RUNPREFIX = $$PREFIX -+} - - INCLUDEPATH += $${PREFIX}/include -+INCLUDEPATH += $${PREFIX}/include/mythtv -+INCLUDEPATH += $${PREFIX}/include/mythtv/libmythdb -+INCLUDEPATH += $${PREFIX}/include/mythtv/libmythui -+INCLUDEPATH += $${PREFIX}/include/mythtv/libmyth - #INCLUDEPATH *= /usr/local/include - - DEFINES += _GNU_SOURCE --DEFINES += PREFIX=\\\"$${PREFIX}\\\" -+DEFINES += PREFIX=\\\"$${RUNPREFIX}\\\" - DEFINES += VERSION=\\\"$${VERSION}\\\" - - QMAKE_LFLAGS -= -Wl,--no-undefined ======================================= --- /trunk/gar-minimyth/script/myth-trunk/mythstream/files/mythstream-0.18_qt4-qt_bitblt_replace.patch Sat Aug 15 01:52:33 2009 +++ /dev/null @@ -1,241 +0,0 @@ -diff -Naur mythstream-0.18_qt4-old/mythstream/mythstream.cpp mythstream-0.18_qt4-new/mythstream/mythstream.cpp ---- mythstream-0.18_qt4-old/mythstream/mythstream.cpp 2009-08-15 01:44:07.000000000 -0700 -+++ mythstream-0.18_qt4-new/mythstream/mythstream.cpp 2009-08-15 01:44:44.000000000 -0700 -@@ -94,10 +94,10 @@ - { - } - --void setPainterCol(QPainter *p, QColor col) -+void setPainterCol(QPainter &p, QColor col) - { -- p->setPen( col ); -- p->setBrush( QBrush(col, Qt::SolidPattern) ); -+ p.setPen( col ); -+ p.setBrush( QBrush(col, Qt::SolidPattern) ); - } - - void FFTBox::buildFFTBackground() -@@ -112,9 +112,11 @@ - fftPict = QPixmap(bckPict); - QColor col = QColor(0x07, 0x99, 0); - -- QPainter *painter = new QPainter( &fftPict ); -- painter->setPen( col ); -- painter->setBrush( QBrush(col, Qt::SolidPattern) ); -+ QPainter p; -+ -+ p.begin( &fftPict ); -+ p.setPen( col ); -+ p.setBrush( QBrush(col, Qt::SolidPattern) ); - - int barHeight = height(); - int divSpace = 2; -@@ -129,13 +131,13 @@ - for ( int i = 0; i < barCount; i++) - for ( int j = 0; j < 20; j++) - { -- if (j == 0) setPainterCol(painter, fftLow); -- if (j == 5) setPainterCol(painter, fftMid); -- if (j == 10) setPainterCol(painter, fftHigh); -- painter->drawRect( i*(barWidth + 2) + 1, barHeight - (j + 1) * (barDiv + divSpace) + divSpace, barWidth, barDiv); -+ if (j == 0) setPainterCol(p, fftLow); -+ if (j == 5) setPainterCol(p, fftMid); -+ if (j == 10) setPainterCol(p, fftHigh); -+ p.drawRect( i*(barWidth + 2) + 1, barHeight - (j + 1) * (barDiv + divSpace) + divSpace, barWidth, barDiv); - } - -- delete(painter); -+ p.end(); - - fftMask = QBitmap(fftPict.size(), true); - drawPict = QPixmap(fftPict.size()); -@@ -152,9 +154,11 @@ - fftMask.fill(Qt::color0); - int barHeight; - -- QPainter *painter = new QPainter( &fftMask ); -- painter->setPen( col ); -- painter->setBrush( QBrush(col, Qt::SolidPattern) ); -+ QPainter p; -+ -+ p.begin( &fftMask ); -+ p.setPen( col ); -+ p.setBrush( QBrush(col, Qt::SolidPattern) ); - - if (percentage) - { -@@ -163,20 +167,25 @@ - barHeight = int ( float( percentage->values[i] ) * div ); - if ( barHeight > height() ) barHeight = height(); - if ( barHeight < 0 ) barHeight = 0; -- painter->drawRect( i*(barWidth + 2) + 1, height() - barHeight, barWidth, height() ); -+ p.drawRect( i*(barWidth + 2) + 1, height() - barHeight, barWidth, height() ); - } - } - -- painter->setPen( Qt::color1 ); -- painter->setBrush( QBrush(Qt::color1, Qt::NoBrush) ); -- painter->drawRect( 0, height()-1, gaugeWidth, height() ); -- delete(painter); -+ p.setPen( Qt::color1 ); -+ p.setBrush( QBrush(Qt::color1, Qt::NoBrush) ); -+ p.drawRect( 0, height()-1, gaugeWidth, height() ); -+ p.end(); - - fftPict.setMask(fftMask); - -- bitBlt(&drawPict, QPoint(0,0), &bckPict, rect(), QPainter::CompositionMode_SourceOver); -- bitBlt(&drawPict, QPoint(0,0), &fftPict, rect(), QPainter::CompositionMode_SourceOver); -- bitBlt(this, QPoint(0,0), &drawPict, rect(), QPainter::CompositionMode_SourceOver); -+ p.begin( &drawPict ); -+ p.drawPixmap(QPoint(0,0), bckPict, rect()); -+ p.drawPixmap(QPoint(0,0), fftPict, rect()); -+ p.end(); -+ -+ p.begin( this ); -+ p.drawPixmap(QPoint(0,0), drawPict, rect()); -+ p.end(); - } - - void FFTBox::setPercentage(Spectrum* percent) -@@ -801,7 +810,7 @@ - if (clearVideo) - { - clearOnly = true; // oops, gui is mess... (clear video window) -- invalidateSection(bot); -+ invalidateSection(all); - updateInvalidated(); - clearVideo = false; - } -@@ -884,9 +893,15 @@ - if ( playerState.pollMe() ) - { - if ( playerState.getDisplayStatus() == PlayerState::video ) -+ { - streamBrowser->showVideo(); -+ invalidateSection(all); -+ } -+ else -+ { -+ invalidateSection(bot); -+ } - -- botSectInvalidated = true; - updateInvalidated(); - } - } -@@ -1285,7 +1300,7 @@ - { - streamBrowser->hideVideo(); // hide video window - clearOnly = true; // oops, gui is mess... (clear video window) -- invalidateSection(bot); -+ invalidateSection(all); - updateInvalidated(); - } - -@@ -1511,9 +1526,13 @@ - // new screen update handling, partly implemented - void MythStream::updateInvalidated() - { -- if (topSectInvalidated) update(m_TopRect); -- if (midSectInvalidated) update(m_MidRect); -- if (botSectInvalidated) update(m_BotRect); -+ QRect rect; -+ -+ if (topSectInvalidated) rect = rect | m_TopRect; -+ if (midSectInvalidated) rect = rect | m_MidRect; -+ if (botSectInvalidated) rect = rect | m_BotRect; -+ -+ update(rect); - - topSectInvalidated = false; - midSectInvalidated = false; -@@ -1546,6 +1565,7 @@ - case StreamBrowser::streamstatus: - getStreamStatusValues(); - botSectInvalidated = true; // stream info fields -+ midSectInvalidated = true; - topSectInvalidated = true; // status field - break; - case StreamBrowser::streamplay: -@@ -1816,11 +1836,14 @@ - { - - // unconditional update -- QPixmap pix(m_TopRect.size()); -- pix.fill(this, m_TopRect.topLeft()); -- QPainter p(&pix); - - LayerSet* container = m_Theme->GetSet("status_panel"); -+ QRect rect = container->GetAreaRect(); -+ -+ QPainter p; -+ -+ QPixmap pix( rect.size() ); -+ pix.fill(this, rect.topLeft()); - - if (container) - { -@@ -1837,8 +1860,9 @@ - - p.end(); - -- bitBlt(this, m_TopRect.left(), m_TopRect.top(), -- &pix, 0, 0, -1, -1, QPainter::CompositionMode_SourceOver); -+ p.begin(this); -+ p.drawPixmap(rect.left(), rect.top(), pix); -+ p.end(); - - } - -@@ -1851,10 +1875,11 @@ - LayerSet* container = m_Theme->GetSet("dyn_panel"); - QRect rect = container->GetAreaRect(); - -+ QPainter p; -+ - QPixmap pix( rect.size() ); - pix.fill(this, rect.topLeft() ); -- QPainter p(&pix); -- -+ p.begin(&pix); - - if (container) - { -@@ -1864,8 +1889,9 @@ - - p.end(); - -- bitBlt(this, rect.left(), rect.top(), -- &pix, 0, 0, -1, -1, QPainter::CompositionMode_SourceOver); -+ p.begin(this); -+ p.drawPixmap(rect.left(), rect.top(), pix); -+ p.end(); - - } - -@@ -1902,9 +1928,11 @@ - - QRect rect = container->GetAreaRect(); - -+ QPainter p; -+ - QPixmap pix( rect.size() ); - pix.fill(this, rect.topLeft()); -- QPainter p(&pix); -+ p.begin(&pix); - - if (container) - { -@@ -1925,8 +1953,9 @@ - - p.end(); - -- bitBlt(this, rect.left(), rect.top(), -- &pix, 0, 0, -1, -1, QPainter::CompositionMode_SourceOver); -+ p.begin(this); -+ p.drawPixmap(rect.left(), rect.top(), pix); -+ p.end(); - - } - ======================================= --- /trunk/gar-minimyth/script/myth-trunk/mythstream/files/mythstream-0.18_qt4-qt_paintevent_fix.patch Sat Aug 15 01:52:33 2009 +++ /dev/null @@ -1,95 +0,0 @@ -diff -Naur mythstream-0.18_qt4-old/mythstream/mythstream.cpp mythstream-0.18_qt4-new/mythstream/mythstream.cpp ---- mythstream-0.18_qt4-old/mythstream/mythstream.cpp 2009-08-15 01:41:53.000000000 -0700 -+++ mythstream-0.18_qt4-new/mythstream/mythstream.cpp 2009-08-15 01:44:07.000000000 -0700 -@@ -327,6 +327,8 @@ - - clearVideo = false; // was video screen drawn? - -+ clearOnly = false; // should the next paint be clear only. -+ - setNoErase(); - updateBackground(); - -@@ -798,7 +800,9 @@ - - if (clearVideo) - { -- updateBotView(true); // oops, gui is mess... (clear video window) -+ clearOnly = true; // oops, gui is mess... (clear video window) -+ invalidateSection(bot); -+ updateInvalidated(); - clearVideo = false; - } - } -@@ -1280,7 +1284,9 @@ - else - { - streamBrowser->hideVideo(); // hide video window -- updateBotView(true); // oops, gui is mess... (clear video window) -+ clearOnly = true; // oops, gui is mess... (clear video window) -+ invalidateSection(bot); -+ updateInvalidated(); - } - - } -@@ -1573,15 +1579,30 @@ - { - QRect r = e->rect(); - -+ // the video panel is not clean so clean it -+ if (clearOnly) -+ { -+ updateBotView(); -+ clearOnly = false; -+ // if we are playing a video, then there is nothing left to update, -+ // although I do not know why we would clearing the video panel were a video playing -+ if ( playerState.getDisplayStatus() == PlayerState::video ) -+ { -+ return; -+ } -+ } -+ - if (r.intersects(m_TopRect)) -+ { - updateTopView(); -+ } - if (r.intersects(m_MidRect)) - { - updateMidView(); - } - if (r.intersects(m_BotRect)) - { -- updateBotView(false); -+ updateBotView(); - } - } - -@@ -1849,7 +1870,7 @@ - } - - --void MythStream::updateBotView(bool clearOnly) -+void MythStream::updateBotView() - { - - LayerSet* container = 0; -diff -Naur mythstream-0.18_qt4-old/mythstream/mythstream.h mythstream-0.18_qt4-new/mythstream/mythstream.h ---- mythstream-0.18_qt4-old/mythstream/mythstream.h 2009-08-15 01:23:04.000000000 -0700 -+++ mythstream-0.18_qt4-new/mythstream/mythstream.h 2009-08-15 01:44:07.000000000 -0700 -@@ -197,7 +197,7 @@ - - void updateTopView(); - void updateMidView(); -- void updateBotView(bool clearOnly); -+ void updateBotView(); - - void keyPressEvent( QKeyEvent *k ); - -@@ -232,6 +232,7 @@ - unsigned int m_FolderDisplaySize; - bool clearVideo; - bool harvesting; -+ bool clearOnly; - - - FieldOwner messageOwner; ======================================= --- /trunk/gar-minimyth/script/myth-trunk/mythstream/files/mythstream-0.18_qt4-streams_res.patch Sat Aug 15 01:52:33 2009 +++ /dev/null @@ -1,29 +0,0 @@ -diff -Naur mythstream-0.18_qt4-old/libs/streams.res mythstream-0.18_qt4-new/libs/streams.res ---- mythstream-0.18_qt4-old/libs/streams.res 2007-09-25 11:58:33.000000000 -0700 -+++ mythstream-0.18_qt4-new/libs/streams.res 2009-08-14 12:30:27.000000000 -0700 -@@ -10,7 +10,7 @@ - [item] - Interaction - Browse Shoutcast genres --http://www.shoutcast.com -+http://yp.shoutcast.com/sbin/newxml.phtml - [emptystring] - *shoutcast/menu - -@@ -101,14 +101,14 @@ - [item] - Radio - Shoutcast Country --http://www.shoutcast.com/directory/index.phtml?sgenre=Country&numresult=50 -+http://yp.shoutcast.com/sbin/newxml.phtml?genre=Country&limit=50 - Country music stations - shoutcast - - [item] - Radio - Shoutcast Rock --http://www.shoutcast.com/directory/index.phtml?sgenre=Rock&numresult=50 -+http://yp.shoutcast.com/sbin/newxml.phtml?genre=Rock&limit=50 - Shoutcast Rock stations - shoutcast - ======================================= --- /trunk/gar-minimyth/script/myth-trunk/mythstream/files/mythstream-0.18_qt4-user_agent_quicktime.patch Mon Aug 31 22:27:05 2009 +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur mythstream-0.18_1-old/libs/player.xml mythstream-0.18_1-new/libs/player.xml ---- mythstream-0.18_1-old/libs/player.xml 2007-09-16 13:21:25.000000000 -0700 -+++ mythstream-0.18_1-new/libs/player.xml 2009-08-31 11:49:49.000000000 -0700 -@@ -296,6 +296,11 @@ - <custom> - - <item> -+ <name>-user-agent</name> -+ <value>QuickTime/0</value> -+ </item> -+ -+ <item> - <name>-identify</name> - <value></value> - </item> ======================================= --- /trunk/gar-minimyth/script/myth-trunk/mythstream/files/mythstream-0.18_qt4-youtube_parser_fix.patch Fri Jul 24 08:17:22 2009 +++ /dev/null @@ -1,20 +0,0 @@ -diff -Naur mythstream-0.18_qt4-old/parsers/youtube/search.pl mythstream-0.18_qt4-new/parsers/youtube/search.pl ---- mythstream-0.18_qt4-old/parsers/youtube/search.pl 2008-01-13 08:22:35.000000000 -0800 -+++ mythstream-0.18_qt4-new/parsers/youtube/search.pl 2009-07-24 08:11:58.000000000 -0700 -@@ -91,8 +91,14 @@ - } - $root->appendChild($item); - -- addMetaNode($entry->getElementsByTagName("media:description")->item(0)->getFirstChild->toString, 'description', 'html'); -- addMetaNode($entry->getElementsByTagName("author")->item(0)->getFirstChild->getFirstChild->toString, 'author', 'inline'); -+ if ($entry->getElementsByTagName("media:description")->item(0)->getFirstChild) -+ { -+ addMetaNode($entry->getElementsByTagName("media:description")->item(0)->getFirstChild->toString, 'description', 'html'); -+ } -+ if ($entry->getElementsByTagName("author")->item(0)->getFirstChild->getFirstChild) -+ { -+ addMetaNode($entry->getElementsByTagName("author")->item(0)->getFirstChild->getFirstChild->toString, 'author', 'inline'); -+ } - } - - #------------------------------------------------------------------------------ ======================================= --- /trunk/gar-minimyth/script/myth-trunk/mythstream/files/mythstream-0.18_qt4.patch.gar Tue Feb 3 08:49:29 2009 +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naur mythstream-0.18_qt4-old/settings.pro mythstream-0.18_qt4-new/settings.pro ---- mythstream-0.18_qt4-old/settings.pro 2009-02-02 09:44:18.000000000 -0800 -+++ mythstream-0.18_qt4-new/settings.pro 2009-02-02 09:47:21.000000000 -0800 -@@ -7,11 +7,11 @@ - isEmpty( PREFIX ) { - # Install in /usr/share/... or /usr/local/share/... ? - #PREFIX = /usr/local -- PREFIX = /usr -+ PREFIX = @GAR_DESTDIR@@GAR_prefix@ - } - # Where the binaries actually locate the assets/filters/plugins at runtime - isEmpty( RUNPREFIX ) { -- RUNPREFIX = $$PREFIX -+ RUNPREFIX = @GAR_prefix@ - } - - INCLUDEPATH += $${PREFIX}/include -@@ -26,7 +26,3 @@ - DEFINES += VERSION=\\\"$${VERSION}\\\" - - QMAKE_LFLAGS -= -Wl,--no-undefined -- --release { -- QMAKE_CXXFLAGS_RELEASE = -O2 -fomit-frame-pointer --} ======================================= --- /trunk/gar-minimyth/html/minimyth/document-changelog.txt Fri Sep 4 14:23:11 2009 +++ /trunk/gar-minimyth/html/minimyth/document-changelog.txt Fri Sep 4 17:53:37 2009 @@ -92,6 +92,7 @@ Updated lib/libusb. Updated lib/nss. Updated mediaplayers/mplayer-svn. + Updated myth-trunk/mythstream. Updated net/curl. Updated perl/perl. Updated system/lirc. ======================================= --- /trunk/gar-minimyth/script/myth-trunk/mythstream/Makefile Mon Aug 31 22:27:05 2009 +++ /trunk/gar-minimyth/script/myth-trunk/mythstream/Makefile Fri Sep 4 17:53:37 2009 @@ -1,30 +1,13 @@ GARNAME = mythstream -GARVERSION = 0.18_qt4 +GARVERSION = mythtv-r21640 CATEGORIES = $(CATEGORY) MASTER_SITES = http://home.kabelfoon.nl/~moongies/sw9vc4htz2/ -DISTFILES = $(DISTNAME).tar.gz $(subst -,,$(PARSERS)) -PATCHFILES = -PATCHFILES += \ - $(DISTNAME)-gcc_warnings_fixes.patch \ - $(DISTNAME)-streams_res.patch \ - $(DISTNAME)-qt_paintevent_fix.patch \ - $(DISTNAME)-qt_bitblt_replace.patch \ - $(DISTNAME)-user_agent_quicktime.patch \ - $(DISTNAME)-youtube_parser_fix.patch \ - $(DISTNAME)-mythtv_0_22.patch \ - $(DISTNAME)-fftw3f.patch \ +#DISTFILES = $(DISTNAME).tar.gz $(subst -,,$(PARSERS)) +DISTFILES = $(GARNAME)_$(GARVERSION).tar.gz +PATCHFILES = \ + $(DISTNAME)-qt4_header.patch \ $(DISTNAME).patch.gar -PARSERS = \ - apple-3.pl \ - belegger.tar.gz \ - dailymotion-2.tar.gz \ - google.tar.gz \ - omroep-3.tar.gz \ - retrovision.tar.gz \ - shoutcast-2.tar.gz \ - yahoo.tar.gz \ - youtube-5.tar.gz \ - zoomin.tar.gz +PARSERS = LICENSE = GPL2 DESCRIPTION = @@ -38,7 +21,7 @@ CATEGORY := $(shell basename $(shell dirname $(shell pwd))) -WORKSRC = $(WORKDIR)/$(GARNAME)-0.18_qt4 +WORKSRC = $(WORKDIR)/$(GARNAME)_$(GARVERSION) CONFIGURE_SCRIPTS = $(WORKSRC)/mythtv BUILD_SCRIPTS = $(WORKSRC)/Makefile ======================================= --- /trunk/gar-minimyth/script/myth-trunk/mythstream/checksums Mon Aug 31 22:27:05 2009 +++ /trunk/gar-minimyth/script/myth-trunk/mythstream/checksums Fri Sep 4 17:53:37 2009 @@ -1,20 +1,3 @@ -818f65c2592975b3433ebaa6623aa310 download/mythstream-0.18_qt4.tar.gz -9be8da7d71d4ad3efab90ab2f1de4c7a download/mythstream-0.18_qt4-gcc_warnings_fixes.patch -9a12edbffaa7d6b0635b035501e7ec0c download/mythstream-0.18_qt4-streams_res.patch -59d18d31c2fe7dc5bb2439faa0495ab0 download/mythstream-0.18_qt4-qt_paintevent_fix.patch -6f06a7f1b0fc6086208d7fcd7cb58bd9 download/mythstream-0.18_qt4-qt_bitblt_replace.patch -d07704dfafaef60672baf07733b96ea5 download/mythstream-0.18_qt4-user_agent_quicktime.patch -e2c67be4122927917c77c83cba94ee95 download/mythstream-0.18_qt4-youtube_parser_fix.patch -940cc012f71e822be8ebf3d637af83fb download/mythstream-0.18_qt4-mythtv_0_22.patch -b7b59b661edc6fb3c24dcfb051c52dc0 download/mythstream-0.18_qt4-fftw3f.patch -d66d4a7c81c11ae0b0ea316173e500e5 download/mythstream-0.18_qt4.patch.gar -303175aaa1752ab80cd3b180c3b3f150 download/apple3.pl -b124e9bec22eb352a848463890d4a7e4 download/belegger.tar.gz -ae43295ff71d8c7d8af1c341ad06ff83 download/dailymotion2.tar.gz -626030a79e036c58d79006e48d89454b download/google.tar.gz -9e02ed7d5aa9b148f2fd4fda83b7cd3a download/omroep3.tar.gz -6859fc4d34c941f6cc55cd0fd56038d3 download/retrovision.tar.gz -c3cbadbb170ca6e78ed071020769f0eb download/shoutcast2.tar.gz -d870ecef0f78340c50fde955251cfce9 download/yahoo.tar.gz -d19af57e47ef255cb49bee2147a1b3b9 download/youtube5.tar.gz -187e980c0ebcf2b01a593b7437b2e146 download/zoomin.tar.gz +ba354b83fefe6028c5379fb832a44b6a download/mythstream_mythtv-r21640.tar.gz +a5fd5de82a9d84e48c5b46ea88d428cb download/mythstream-mythtv-r21640-qt4_header.patch +a469d229d3201eab0e1550575567a21a download/mythstream-mythtv-r21640.patch.gar --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "minimyth-commits" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/minimyth-commits?hl=en -~----------~----~----~----~------~----~------~--~---
