Fix remaining string format errors

(cherry picked from commit a8e98ad9ce)
v3.5.13-sru
Timothy Pearson 13 years ago committed by Slávek Banko
parent 5099e9db0f
commit 435c7f9b5a

@ -143,7 +143,7 @@ void k9Menu::convertJpegToMpeg(const TQString &_imageJpg,const TQString &_imageM
if (!process->normalExit()) { if (!process->normalExit()) {
qDebug("error converting jpeg to mpeg"); qDebug("error converting jpeg to mpeg");
} }
qDebug(process->debug().latin1()); qDebug("%s", process->debug().latin1());
} }
void k9Menu::createAudio(const TQString & _audioFile) { void k9Menu::createAudio(const TQString & _audioFile) {

@ -257,7 +257,7 @@ void k9NewDVD::createMencoderCmd(TQString &_cmd,TQString &_chapters, k9AviFile *
*process << "-mpegopts" << "format=dvd" << "-vf" << "scale="+scale+",harddup" << "-srate" << "48000" << "-af" << "lavcresample=48000"; *process << "-mpegopts" << "format=dvd" << "-vf" << "scale="+scale+",harddup" << "-srate" << "48000" << "-af" << "lavcresample=48000";
*process << "-lavcopts" << TQString("vcodec=mpeg2video:vrc_buf_size=1835:vrc_maxrate=9800:vbitrate=%1:keyint=15:acodec=%3:abitrate=%2:aspect=16/9").arg(m_videoBitrate).arg(m_config->getPrefAudioBitrate()).arg(m_config->getPrefAudioFormat().lower()); *process << "-lavcopts" << TQString("vcodec=mpeg2video:vrc_buf_size=1835:vrc_maxrate=9800:vbitrate=%1:keyint=15:acodec=%3:abitrate=%2:aspect=16/9").arg(m_videoBitrate).arg(m_config->getPrefAudioBitrate()).arg(m_config->getPrefAudioFormat().lower());
*process << "-ofps" << fps << "-o" << fileName << "-ss" << t1 << "-endpos" << t2 << _aviFile->getFileName(); *process << "-ofps" << fps << "-o" << fileName << "-ss" << t1 << "-endpos" << t2 << _aviFile->getFileName();
qDebug(process->debug()); qDebug("%s", process->debug().ascii());
/* /*
if (!m_progress->execute()) { if (!m_progress->execute()) {
m_cancel=true; m_cancel=true;

@ -41,7 +41,7 @@ k9HalConnection::k9HalConnection(TQObject *parent, const char *name)
dbus_error_init( &error ); dbus_error_init( &error );
m_dbusConnect = dbus_bus_get( DBUS_BUS_SYSTEM, &error ); m_dbusConnect = dbus_bus_get( DBUS_BUS_SYSTEM, &error );
if( dbus_error_is_set(&error) ) { if( dbus_error_is_set(&error) ) {
qDebug(TQString("Error connecting to DBUS : %1").arg(error.message)); qDebug("%s", (TQString("Error connecting to DBUS : %1").arg(error.message)).ascii());
return; return;
} }

@ -95,7 +95,7 @@ void k9HalDevice::getDriveProperties() {
m_canReadDvd=(caps & LIBHAL_DRIVE_CDROM_CAPS_DVDROM)==LIBHAL_DRIVE_CDROM_CAPS_DVDROM; m_canReadDvd=(caps & LIBHAL_DRIVE_CDROM_CAPS_DVDROM)==LIBHAL_DRIVE_CDROM_CAPS_DVDROM;
m_canBurnDvd=(caps & LIBHAL_DRIVE_CDROM_CAPS_DVDR)==LIBHAL_DRIVE_CDROM_CAPS_DVDR; m_canBurnDvd=(caps & LIBHAL_DRIVE_CDROM_CAPS_DVDR)==LIBHAL_DRIVE_CDROM_CAPS_DVDR;
m_model=TQString(libhal_drive_get_model(drive)); m_model=TQString(libhal_drive_get_model(drive));
// qDebug(TQString("canReadDvd:%1 canBurnDvd:%2 model:%3").arg(m_canReadDvd).arg(m_canBurnDvd).arg(m_model)); // qDebug("%s", (TQString("canReadDvd:%1 canBurnDvd:%2 model:%3").arg(m_canReadDvd).arg(m_canBurnDvd).arg(m_model)).ascii());
libhal_drive_free(drive); libhal_drive_free(drive);

@ -368,7 +368,7 @@ int k9vamps::check_video_packet (uchar *ptr) {
if (ptr [7]) { if (ptr [7]) {
if ((ptr [7] & 0xc0) != 0xc0) if ((ptr [7] & 0xc0) != 0xc0)
qDebug (TQString("First video packet in sequence starting at %1 misses PTS or DTS, flags=%2").arg(rtell (ptr)).arg(ptr [7])); qDebug ("%s", (TQString("First video packet in sequence starting at %1 misses PTS or DTS, flags=%2").arg(rtell (ptr)).arg(ptr [7])).ascii());
else { else {
sequence_header_code = (uint32_t) (ptr [6 + 3 + ptr [8] + 0]) << 24; sequence_header_code = (uint32_t) (ptr [6 + 3 + ptr [8] + 0]) << 24;
sequence_header_code |= (uint32_t) (ptr [6 + 3 + ptr [8] + 1]) << 16; sequence_header_code |= (uint32_t) (ptr [6 + 3 + ptr [8] + 1]) << 16;

@ -347,7 +347,7 @@ double k9CellCopyList::getfactor(bool _withMenus,bool _streams) {
if (dvdSize2 <0) { if (dvdSize2 <0) {
factor=2.5; factor=2.5;
//qDebug(TQString("dvdSize (%1)- _outbytes(%2) - fforcedsh(%3)=%4").arg(dvdSize).arg(m_outbytes).arg(fforcedsh).arg(dvdSize2)); //qDebug("%s", (TQString("dvdSize (%1)- _outbytes(%2) - fforcedsh(%3)=%4").arg(dvdSize).arg(m_outbytes).arg(fforcedsh).arg(dvdSize2).ascii()));
} }
else { else {
factor=(totalSize +menuSize - fforced -m_inbytes)/ dvdSize2 ; factor=(totalSize +menuSize - fforced -m_inbytes)/ dvdSize2 ;
@ -361,7 +361,7 @@ double k9CellCopyList::getfactor(bool _withMenus,bool _streams) {
uint64_t i=m_inbytes; uint64_t i=m_inbytes;
//if (o==0) //if (o==0)
// o=1; // o=1;
//qDebug(TQString("factor : %1 realise : %2").arg(factor).arg((double)i/(double)o)); //qDebug("%s", (TQString("factor : %1 realise : %2").arg(factor).arg((double)i/(double)o).ascii()));
if (factor<=1) if (factor<=1)
factor=1; factor=1;

@ -505,7 +505,7 @@ void k9DVDAuthor::DVDAuthorStderr(KProcess *proc, char *buffer, int buflen ) {
// m_copied+=totalBytes - m_lastPos; // m_copied+=totalBytes - m_lastPos;
m_copied=totalBytes; m_copied=totalBytes;
m_lastPos=totalBytes; m_lastPos=totalBytes;
//qDebug(TQString("copied : %1 totalSize : %2").arg(m_copied).arg(m_totalSize*512)); //qDebug("%s", (TQString("copied : %1 totalSize : %2").arg(m_copied).arg(m_totalSize*512).ascii());
m_percent=(float)m_copied / (float)(m_totalSize/DVD_VIDEO_LB_LEN ); m_percent=(float)m_copied / (float)(m_totalSize/DVD_VIDEO_LB_LEN );
@ -526,7 +526,7 @@ void k9DVDAuthor::DVDAuthorStderr(KProcess *proc, char *buffer, int buflen ) {
} }
/* else { /* else {
if (!m_stderr.startsWith("libdvdread") && m_stderr.startsWith("libdvdnav")) if (!m_stderr.startsWith("libdvdread") && m_stderr.startsWith("libdvdnav"))
qDebug(m_stderr); qDebug("%s", m_stderr.ascii());
} }
*/ */
int end; int end;

@ -870,7 +870,7 @@ void k9Ifo2::checkBuffer(TQString lib,uchar* _buffer) {
if (memcmp(bufCopy,_buffer,bufCopySize)!=0) { if (memcmp(bufCopy,_buffer,bufCopySize)!=0) {
TQString c; TQString c;
c="Buffer de sortie altéré: " +lib; c="Buffer de sortie altéré: " +lib;
qDebug(c.latin1()); qDebug("%s", c.latin1());
} }
} }

@ -392,7 +392,7 @@ void k9MP4Enc::execute ( k9DVDTitle *_title )
TQCString str=* ( m_process->args().at ( i ) ); TQCString str=* ( m_process->args().at ( i ) );
s +=TQString ( str ) +" "; s +=TQString ( str ) +" ";
} }
qDebug ( s ); qDebug ( "%s", s.ascii() );
time->start(); time->start();
m_timer3.start(); m_timer3.start();
connect ( m_process, TQT_SIGNAL ( receivedStdout ( KProcess *, char *, int ) ),this, TQT_SLOT ( getStdout ( KProcess *, char *, int ) ) ); connect ( m_process, TQT_SIGNAL ( receivedStdout ( KProcess *, char *, int ) ),this, TQT_SLOT ( getStdout ( KProcess *, char *, int ) ) );

Loading…
Cancel
Save