Commit 98815488 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

Removing references to QString::toStdString

parent 951fc1b6
...@@ -107,20 +107,20 @@ void Media::flushVolatileParameters() ...@@ -107,20 +107,20 @@ void Media::flushVolatileParameters()
QString defaultValue; QString defaultValue;
foreach ( defaultValue, m_volatileParameters ) foreach ( defaultValue, m_volatileParameters )
{ {
m_vlcMedia->addOption( defaultValue.toStdString().c_str() ); m_vlcMedia->addOption( defaultValue.toUtf8().constData() );
} }
m_volatileParameters.clear(); m_volatileParameters.clear();
} }
void Media::addVolatileParam( const QString& param, const QString& defaultValue ) void Media::addVolatileParam( const QString& param, const QString& defaultValue )
{ {
m_vlcMedia->addOption( param.toStdString().c_str() ); m_vlcMedia->addOption( param.toUtf8().constData() );
m_volatileParameters.append( defaultValue ); m_volatileParameters.append( defaultValue );
} }
void Media::addConstantParam( const QString& param ) void Media::addConstantParam( const QString& param )
{ {
m_vlcMedia->addOption( param.toStdString().c_str() ); m_vlcMedia->addOption( param.toUtf8().constData() );
} }
const QFileInfo* Media::fileInfo() const const QFileInfo* Media::fileInfo() const
......
...@@ -50,7 +50,7 @@ Transcoder::transcodeToPs() ...@@ -50,7 +50,7 @@ Transcoder::transcodeToPs()
outputDir = m_media->fileInfo()->absolutePath(); outputDir = m_media->fileInfo()->absolutePath();
m_destinationFile = outputDir + '/' + m_media->fileInfo()->baseName() + ".ps"; m_destinationFile = outputDir + '/' + m_media->fileInfo()->baseName() + ".ps";
QString option = ":sout=file://" + m_destinationFile; QString option = ":sout=file://" + m_destinationFile;
media->addOption( option.toStdString().c_str() ); media->addOption( option.toUtf8().constData() );
LibVLCpp::MediaPlayer *mp = new LibVLCpp::MediaPlayer( media ); LibVLCpp::MediaPlayer *mp = new LibVLCpp::MediaPlayer( media );
connect( mp, SIGNAL( positionChanged( float ) ), this, SIGNAL( progress( float ) ) ); connect( mp, SIGNAL( positionChanged( float ) ), this, SIGNAL( progress( float ) ) );
connect( mp, SIGNAL( endReached() ), this, SLOT( transcodeFinished() ) ); connect( mp, SIGNAL( endReached() ), this, SLOT( transcodeFinished() ) );
......
...@@ -171,7 +171,7 @@ MetaDataWorker::renderSnapshot() ...@@ -171,7 +171,7 @@ MetaDataWorker::renderSnapshot()
this, SLOT( setSnapshot( const char* ) ), Qt::QueuedConnection ); this, SLOT( setSnapshot( const char* ) ), Qt::QueuedConnection );
//The slot should be triggered in this methode //The slot should be triggered in this methode
m_mediaPlayer->takeSnapshot( tmp.fileName().toStdString().c_str(), 0, 0 ); m_mediaPlayer->takeSnapshot( tmp.fileName().toUtf8().constData(), 0, 0 );
//Snapshot slot should has been called (but maybe not in next version...) //Snapshot slot should has been called (but maybe not in next version...)
} }
......
...@@ -44,8 +44,8 @@ WorkspaceWorker::run() ...@@ -44,8 +44,8 @@ WorkspaceWorker::run()
bool hardLinkOk = false; bool hardLinkOk = false;
#ifdef Q_OS_UNIX #ifdef Q_OS_UNIX
if ( link( m_media->fileInfo()->absoluteFilePath().toStdString().c_str(), if ( link( m_media->fileInfo()->absoluteFilePath().toUtf8().constData(),
m_dest.toStdString().c_str() ) < 0 ) m_dest.toUtf8().constData() ) < 0 )
{ {
qDebug() << "Can't create hard link:" << strerror(errno) << "falling back to" qDebug() << "Can't create hard link:" << strerror(errno) << "falling back to"
" hard copy mode."; " hard copy mode.";
......
...@@ -56,7 +56,7 @@ void WorkflowFileRenderer::run( const QString& outputFileName, quint32 wi ...@@ -56,7 +56,7 @@ void WorkflowFileRenderer::run( const QString& outputFileName, quint32 wi
",no-hurry-up}" ",no-hurry-up}"
":standard{access=file,mux=ps,dst=\"" ":standard{access=file,mux=ps,dst=\""
+ outputFileName + "\"}"; + outputFileName + "\"}";
m_media->addOption( transcodeStr.toStdString().c_str() ); m_media->addOption( transcodeStr.toUtf8().constData() );
m_mediaPlayer->setMedia( m_media ); m_mediaPlayer->setMedia( m_media );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment