Changeset 156 for smplayer/trunk/src/mplayerprocess.cpp
- Timestamp:
- Feb 21, 2014, 5:26:03 PM (11 years ago)
- Location:
- smplayer/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
smplayer/trunk
- Property svn:mergeinfo changed
/smplayer/vendor/current merged: 154
- Property svn:mergeinfo changed
-
smplayer/trunk/src/mplayerprocess.cpp
r142 r156 97 97 //qDebug("MplayerProcess::writeToStdin"); 98 98 #if !defined(Q_OS_OS2) 99 #ifdef Q_OS_WIN 100 write( text.toUtf8() + "\n"); 101 #else 99 102 write( text.toLocal8Bit() + "\n"); 103 #endif 100 104 #else 101 105 MPpipeWrite( text.toLocal8Bit() + "\n"); … … 228 232 QString line = ColorUtils::stripColorsTags(QString::fromLocal8Bit(ba)); 229 233 #else 234 #ifdef Q_OS_WIN 235 QString line = QString::fromUtf8(ba); 236 #else 230 237 QString line = QString::fromLocal8Bit(ba); 238 #endif 231 239 #endif 232 240
Note:
See TracChangeset
for help on using the changeset viewer.