Hello community, here is the log from the commit of package qmmp for openSUSE:Factory checked in at 2015-10-24 10:29:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qmmp (Old) and /work/SRC/openSUSE:Factory/.qmmp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qmmp" Changes: -------- --- /work/SRC/openSUSE:Factory/qmmp/qmmp.changes 2015-10-20 00:04:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qmmp.new/qmmp.changes 2015-10-24 10:30:17.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Oct 22 08:54:51 UTC 2015 - [email protected] + +- Update to 0.9.3: + * Improve command line parser. + * Fix crash in the mplayer engine. + * Fix time indicator in the qsui plugin. + * Fix truncated output of the '--pl-dump' command. + * Fix track indexes calculation. + +------------------------------------------------------------------- Old: ---- qmmp-0.9.2.tar.bz2 New: ---- qmmp-0.9.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qmmp.spec ++++++ --- /var/tmp/diff_new_pack.9elYBE/_old 2015-10-24 10:30:18.000000000 +0200 +++ /var/tmp/diff_new_pack.9elYBE/_new 2015-10-24 10:30:18.000000000 +0200 @@ -19,7 +19,7 @@ %define sover 0 %bcond_with restricted Name: qmmp -Version: 0.9.2 +Version: 0.9.3 Release: 0 Summary: Qt-based Multimedia Player License: GPL-2.0+ ++++++ qmmp-0.9.2.tar.bz2 -> qmmp-0.9.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-0.9.2/ChangeLog new/qmmp-0.9.3/ChangeLog --- old/qmmp-0.9.2/ChangeLog 2015-10-01 14:13:39.000000000 +0200 +++ new/qmmp-0.9.3/ChangeLog 2015-10-21 11:13:31.000000000 +0200 @@ -1052,3 +1052,10 @@ * fixed effects and decoders sorting * fixed possible race condition * updated Greek translation (Dimitrios Glentadakis) + +Version 0.9.3 +* improved command line parser +* fixed crash in the mplayer engine +* fixed time indicator in the qsui plugin +* fixed truncated output of the '--pl-dump' command +* fixed track indexes calculation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-0.9.2/ChangeLog.rus new/qmmp-0.9.3/ChangeLog.rus --- old/qmmp-0.9.2/ChangeLog.rus 2015-10-01 14:13:39.000000000 +0200 +++ new/qmmp-0.9.3/ChangeLog.rus 2015-10-21 11:13:31.000000000 +0200 @@ -1054,3 +1054,10 @@ * исправлена сортировка эффектов и декодеров * исправлена возможная гонка ресурсов * обновлён греческий перевод (Dimitrios Glentadakis) + +Версия 0.9.3 +* улучшен парсер командной строки +* исправлено аварийное завершение программы в модуле поддержки mplayer-а +* исправлен индикатор времени в модуле qsui +* исправлен обрезанный вывод консольной команды "--pl-dump" +* исправлено индексирование треков diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-0.9.2/ChangeLog.svn new/qmmp-0.9.3/ChangeLog.svn --- old/qmmp-0.9.2/ChangeLog.svn 2015-10-01 14:13:39.000000000 +0200 +++ new/qmmp-0.9.3/ChangeLog.svn 2015-10-21 11:13:31.000000000 +0200 @@ -1,4 +1,37 @@ ------------------------------------------------------------------------ +r5711 | trialuser02 | 2015-10-21 12:08:49 +0300 (Ср., 21 окт. 2015) | 1 line + +fixed changelogs +------------------------------------------------------------------------ +r5710 | trialuser02 | 2015-10-20 20:44:33 +0300 (Вт., 20 окт. 2015) | 1 line + +updated changelogs +------------------------------------------------------------------------ +r5709 | trialuser02 | 2015-10-20 19:58:10 +0300 (Вт., 20 окт. 2015) | 1 line + +fixed track indexes calculation +------------------------------------------------------------------------ +r5708 | trialuser02 | 2015-10-20 19:57:34 +0300 (Вт., 20 окт. 2015) | 2 lines + +fixed truncated output of the '--pl-dump' command (#822) + +------------------------------------------------------------------------ +r5699 | trialuser02 | 2015-10-17 20:58:25 +0300 (Сб., 17 окт. 2015) | 1 line + +qsui: fixed time indicator +------------------------------------------------------------------------ +r5678 | trialuser02 | 2015-10-14 11:46:02 +0300 (Ср., 14 окт. 2015) | 1 line + +fixed crash in the mplayer engine (Backported from trunk) +------------------------------------------------------------------------ +r5675 | trialuser02 | 2015-10-12 20:25:26 +0300 (Пн., 12 окт. 2015) | 1 line + +improved command line parser (#814) +------------------------------------------------------------------------ +r5633 | trialuser02 | 2015-10-01 15:17:25 +0300 (Чт., 01 окт. 2015) | 1 line + +version bump +------------------------------------------------------------------------ r5627 | trialuser02 | 2015-10-01 12:26:15 +0300 (Чт., 01 окт. 2015) | 1 line updated changelogs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-0.9.2/qmmp.pri new/qmmp-0.9.3/qmmp.pri --- old/qmmp-0.9.2/qmmp.pri 2015-10-01 14:13:39.000000000 +0200 +++ new/qmmp-0.9.3/qmmp.pri 2015-10-21 11:13:31.000000000 +0200 @@ -8,7 +8,7 @@ #Version -QMMP_VERSION = 0.9.2 +QMMP_VERSION = 0.9.3 #Comment/uncomment this if you want to change plugins list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-0.9.2/src/app/builtincommandlineoption.cpp new/qmmp-0.9.3/src/app/builtincommandlineoption.cpp --- old/qmmp-0.9.2/src/app/builtincommandlineoption.cpp 2015-10-01 14:13:33.000000000 +0200 +++ new/qmmp-0.9.3/src/app/builtincommandlineoption.cpp 2015-10-21 11:12:48.000000000 +0200 @@ -224,12 +224,17 @@ QHash <QString, QStringList> BuiltinCommandLineOption::splitArgs(const QStringList &args) const { QHash <QString, QStringList> commands; + QString lastCmd; foreach(QString arg, args) { - if(arg.startsWith("-") || arg.startsWith("--")) - commands.insert(arg, QStringList()); - else if(!commands.isEmpty()) - commands[commands.keys().last()] << arg; + QString cmd = arg.trimmed(); + if(cmd.startsWith("-") || cmd.startsWith("--")) + { + commands.insert(cmd, QStringList()); + lastCmd = cmd; + } + else if(!commands.isEmpty() && !lastCmd.isEmpty()) + commands[lastCmd] << arg; } return commands; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-0.9.2/src/app/qmmp.rc new/qmmp-0.9.3/src/app/qmmp.rc --- old/qmmp-0.9.2/src/app/qmmp.rc 2015-10-01 14:13:33.000000000 +0200 +++ new/qmmp-0.9.3/src/app/qmmp.rc 2015-10-21 11:12:48.000000000 +0200 @@ -1,7 +1,7 @@ #include <winver.h> -#define QMMP_FILEVERSION 0,9,2,0 -#define QMMP_PRODUCTVERSION "0.9.2.0" +#define QMMP_FILEVERSION 0,9,3,0 +#define QMMP_PRODUCTVERSION "0.9.3.0" IDI_ICON1 ICON DISCARDABLE "images\\ico\\qmmp.ico" IDI_ICON2 ICON DISCARDABLE "images\\ico\\qmmp_file.ico" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-0.9.2/src/app/qmmpstarter.cpp new/qmmp-0.9.3/src/app/qmmpstarter.cpp --- old/qmmp-0.9.2/src/app/qmmpstarter.cpp 2015-10-01 14:13:33.000000000 +0200 +++ new/qmmp-0.9.3/src/app/qmmpstarter.cpp 2015-10-21 11:12:48.000000000 +0200 @@ -64,9 +64,9 @@ m_option_manager = new BuiltinCommandLineOption(this); QStringList tmp; for (int i = 1;i < argc;i++) - tmp << QString::fromLocal8Bit(argv[i]).trimmed(); + tmp << QString::fromLocal8Bit(argv[i]); - argString = tmp.join("\n"); + argString = tmp.join("|||"); QHash <QString, QStringList> commands = m_option_manager->splitArgs(tmp); if(commands.keys().contains("--help")) @@ -165,7 +165,7 @@ void QMMPStarter::startPlayer() { connect(m_server, SIGNAL(newConnection()), SLOT(readCommand())); - QStringList args = argString.split("\n", QString::SkipEmptyParts); + QStringList args = argString.split("|||", QString::SkipEmptyParts); #ifdef Q_OS_WIN QIcon::setThemeSearchPaths(QStringList() << qApp->applicationDirPath() + "/themes/"); @@ -228,7 +228,7 @@ void QMMPStarter::writeCommand() { - QString workingDir = QDir::currentPath() + "\n"; + QString workingDir = QDir::currentPath() + "|||"; QByteArray barray; barray.append(workingDir.toUtf8 ()); barray.append(argString.isEmpty() ? "--show-mw" : argString.toUtf8 ()); @@ -239,7 +239,7 @@ } m_socket->flush(); //reading answer - if(m_socket->waitForReadyRead(1500)) + while(m_socket->waitForReadyRead(1500)) cout << m_socket->readAll().data(); #ifndef Q_OS_WIN @@ -260,14 +260,15 @@ socket->deleteLater(); return; } - QStringList slist = QString::fromUtf8(inputArray.data()).split("\n",QString::SkipEmptyParts); + QStringList slist = QString::fromUtf8(inputArray.data()).split("|||",QString::SkipEmptyParts); QString cwd = slist.takeAt(0); QString out = processCommandArgs(slist, cwd); if(!out.isEmpty()) { //writing answer socket->write(out.toLocal8Bit()); - socket->flush(); + while(socket->waitForBytesWritten()) + socket->flush(); } socket->deleteLater(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-0.9.2/src/plugins/Engines/mplayer/mplayerengine.cpp new/qmmp-0.9.3/src/plugins/Engines/mplayer/mplayerengine.cpp --- old/qmmp-0.9.2/src/plugins/Engines/mplayer/mplayerengine.cpp 2015-10-01 14:13:33.000000000 +0200 +++ new/qmmp-0.9.3/src/plugins/Engines/mplayer/mplayerengine.cpp 2015-10-21 11:12:52.000000000 +0200 @@ -176,8 +176,8 @@ m_process->write("quit\n"); m_process->waitForFinished(3500); m_process->kill(); + StateHandler::instance()->dispatch(Qmmp::Stopped); } - StateHandler::instance()->dispatch(Qmmp::Stopped); } void MplayerEngine::pause() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-0.9.2/src/plugins/Ui/qsui/mainwindow.cpp new/qmmp-0.9.3/src/plugins/Ui/qsui/mainwindow.cpp --- old/qmmp-0.9.2/src/plugins/Ui/qsui/mainwindow.cpp 2015-10-01 14:13:33.000000000 +0200 +++ new/qmmp-0.9.3/src/plugins/Ui/qsui/mainwindow.cpp 2015-10-21 11:12:49.000000000 +0200 @@ -196,7 +196,9 @@ m_slider->setValue(pos/1000); QString text = MetaDataFormatter::formatLength(pos/1000); - if(m_core->totalTime() > 0) + if(text.isEmpty()) + text = "0:00"; + if(m_core->totalTime() > 1000) { text.append("/"); text.append(MetaDataFormatter::formatLength(m_core->totalTime()/1000)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-0.9.2/src/qmmp/qmmp.h new/qmmp-0.9.3/src/qmmp/qmmp.h --- old/qmmp-0.9.2/src/qmmp/qmmp.h 2015-10-01 14:13:39.000000000 +0200 +++ new/qmmp-0.9.3/src/qmmp/qmmp.h 2015-10-21 11:13:31.000000000 +0200 @@ -24,7 +24,7 @@ #define QMMP_VERSION_MAJOR 0 #define QMMP_VERSION_MINOR 9 -#define QMMP_VERSION_PATCH 2 +#define QMMP_VERSION_PATCH 3 #define QMMP_VERSION_STABLE 1 #define QMMP_VERSION_INT (QMMP_VERSION_MAJOR<<16 | QMMP_VERSION_MINOR<<8 | QMMP_VERSION_PATCH) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-0.9.2/src/qmmpui/groupedcontainer.cpp new/qmmp-0.9.3/src/qmmpui/groupedcontainer.cpp --- old/qmmp-0.9.2/src/qmmpui/groupedcontainer.cpp 2015-10-01 14:13:33.000000000 +0200 +++ new/qmmp-0.9.3/src/qmmpui/groupedcontainer.cpp 2015-10-21 11:12:48.000000000 +0200 @@ -52,6 +52,7 @@ { m_groups[i]->trackList.append(track); m_items.insert(lastIndex + 1, track); + m_update = true; return; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-0.9.2/src/qmmpui/normalcontainer.cpp new/qmmp-0.9.3/src/qmmpui/normalcontainer.cpp --- old/qmmp-0.9.2/src/qmmpui/normalcontainer.cpp 2015-10-01 14:13:33.000000000 +0200 +++ new/qmmp-0.9.3/src/qmmpui/normalcontainer.cpp 2015-10-21 11:12:48.000000000 +0200 @@ -43,6 +43,9 @@ { m_items.insert(index, track); track->setTrackIndex(index); + //update indexes + for(int i = index; i < m_items.count(); ++i) + m_items[i]->setTrackIndex(i); } else {
