[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/multimedia/kmplayer
From:       Laurent Montel <montel () kde ! org>
Date:       2011-05-27 12:51:02
Message-ID: 20110527125102.A36BCAC73E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1233784 by mlaurent:

Fix compile with "-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS"


 M  +1 -0      CMakeLists.txt  
 M  +1 -1      src/kmplayerconfig.cpp  
 M  +1 -1      src/kmplayertvsource.cpp  


--- trunk/extragear/multimedia/kmplayer/CMakeLists.txt #1233783:1233784
@@ -14,6 +14,7 @@
 include (MacroLibrary)
 
 add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
 include_directories( ${KDE4_INCLUDES})
 
 if(NOT WIN32)
--- trunk/extragear/multimedia/kmplayer/src/kmplayerconfig.cpp #1233783:1233784
@@ -634,7 +634,7 @@
                     urlchanged = false;
                     KMessageBox::error (m_player->view (), i18n ("File %1 does not \
exist.",url.url ()), i18n ("Error"));  } else {
-                    configdialog->m_SourcePageURL->url->setUrl (fi.absFilePath () + \
xine_directives); +                    configdialog->m_SourcePageURL->url->setUrl \
(QString(fi.absFilePath () + xine_directives));  }
             }
             if (urlchanged &&
--- trunk/extragear/multimedia/kmplayer/src/kmplayertvsource.cpp #1233783:1233784
@@ -502,7 +502,7 @@
             tvdevice->getAttribute (KMPlayer::Ids::attr_width).toInt (),
             tvdevice->getAttribute (KMPlayer::Ids::attr_height).toInt ());
     m_options.sprintf ("-tv noaudio:driver=%s:%s:width=%d:height=%d -slave -nocache \
-quiet", tvdriver.toAscii ().data (), command.toAscii ().data (), width (), height \
                ());
-    m_recordcmd.sprintf ("-tv %s:driver=%s:%s:width=%d:height=%d", \
m_audiodevice.isEmpty () ? "noaudio" : (QString ("forceaudio:adevice=") + \
m_audiodevice).toAscii ().data(), tvdriver.toAscii ().data (), command.toAscii \
().data (), width (), height ()); +    m_recordcmd.sprintf ("-tv \
%s:driver=%s:%s:width=%d:height=%d", m_audiodevice.isEmpty () ? "noaudio" : \
QString(QLatin1String ("forceaudio:adevice=") + m_audiodevice).toAscii ().data(), \
tvdriver.toAscii ().data (), command.toAscii ().data (), width (), height ());  }
 
 KDE_NO_EXPORT void KMPlayerTVSource::menuClicked (int id) {


[prev in list] [next in list] [prev in thread] [next in thread]