Hello community,
here is the log from the commit of package qmmp for openSUSE:Factory checked in at 2012-07-24 22:43:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qmmp (Old)
and /work/SRC/openSUSE:Factory/.qmmp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qmmp", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/qmmp/qmmp.changes 2012-07-02 12:46:56.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.qmmp.new/qmmp.changes 2012-07-24 22:43:12.000000000 +0200
@@ -1,0 +2,15 @@
+Mon Jul 23 22:51:24 UTC 2012 - reddwarf@opensuse.org
+
+- Update to 0.6.1
+ * added icons to the file dialog buttons
+ * fixed icecast streams titles
+ * fixed build
+ * fixed default output under windows
+ * fixed api documentation
+ * fixed possible segmentation fault in the cue plugin
+ * fixed cue parsing
+ * fixed automatic charset detection
+ * fixed Ukrainian translation (Gennadi Motsyo)
+ * fixed Russian translation
+
+-------------------------------------------------------------------
Old:
----
qmmp-0.6.0-default_pulse.patch
qmmp-0.6.0.tar.bz2
New:
----
qmmp-0.6.1-default_pulse.patch
qmmp-0.6.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qmmp.spec ++++++
--- /var/tmp/diff_new_pack.DXWolr/_old 2012-07-24 22:43:15.000000000 +0200
+++ /var/tmp/diff_new_pack.DXWolr/_new 2012-07-24 22:43:15.000000000 +0200
@@ -23,7 +23,7 @@
%define soname 0
Name: qmmp
-Version: 0.6.0
+Version: 0.6.1
Release: 0
Summary: XMMS-like audio player
License: GPL-2.0+
@@ -31,8 +31,8 @@
Url: http://qmmp.ylsoftware.com/
Source0: http://qmmp.googlecode.com/files/qmmp-%{version}.tar.bz2
Patch0: qmmp-0.5.5-libcdio_mess.patch
-# PATCH-FEATURE-OPENSUSE qmmp-0.6.0-default_pulse.patch reddwarf@opensuse.org -- Use PulseAudio instead of ALSA by default
-Patch2: qmmp-0.6.0-default_pulse.patch
+# PATCH-FEATURE-OPENSUSE qmmp-0.6.1-default_pulse.patch reddwarf@opensuse.org -- Use PulseAudio instead of ALSA by default
+Patch1: qmmp-0.6.1-default_pulse.patch
BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: gcc-c++
@@ -118,7 +118,7 @@
%prep
%setup -q
%patch0
-%patch2
+%patch1
%build
mkdir build
++++++ qmmp-0.6.0-default_pulse.patch -> qmmp-0.6.1-default_pulse.patch ++++++
--- /work/SRC/openSUSE:Factory/qmmp/qmmp-0.6.0-default_pulse.patch 2012-07-02 12:46:56.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.qmmp.new/qmmp-0.6.1-default_pulse.patch 2012-07-24 22:43:12.000000000 +0200
@@ -8,6 +8,6 @@
#ifdef Q_OS_LINUX
- QString name = settings.value("Output/current_plugin", "alsa").toString();
+ QString name = settings.value("Output/current_plugin", "pulse").toString();
+ #elif defined Q_WS_WIN
+ QString name = settings.value("Output/current_plugin", "waveout").toString();
#else
- QString name = settings.value("Output/current_plugin", "oss4").toString();
- #endif
++++++ qmmp-0.6.0.tar.bz2 -> qmmp-0.6.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-0.6.0/CMakeLists.txt new/qmmp-0.6.1/CMakeLists.txt
--- old/qmmp-0.6.0/CMakeLists.txt 2012-06-30 10:56:52.000000000 +0200
+++ new/qmmp-0.6.1/CMakeLists.txt 2012-07-07 22:09:21.000000000 +0200
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.6.0)
#freebsd support
-include_directories(/usr/local/include)
+include_directories(SYSTEM /usr/local/include)
link_directories(/usr/local/lib)
link_directories(/usr/local/lib32)
link_directories(/usr/local/lib64)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-0.6.0/ChangeLog new/qmmp-0.6.1/ChangeLog
--- old/qmmp-0.6.0/ChangeLog 2012-06-30 10:56:52.000000000 +0200
+++ new/qmmp-0.6.1/ChangeLog 2012-07-22 20:35:47.000000000 +0200
@@ -642,3 +642,15 @@
* updated Polish translation (Grzegorz Gibas)
* updated German translation (Panagiotis Papadopoulos)
* updated Dutch translation (Ronald Uitermark)
+
+Version 0.6.1
+* added icons to the file dialog buttons
+* fixed icecast streams titles
+* fixed build
+* fixed default output under windows
+* fixed api documentation
+* fixed possible segmentation fault in the cue plugin
+* fixed cue parsing
+* fixed automatic charset detection
+* fixed Ukrainian translation (Gennadi Motsyo)
+* fixed Russian translation
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-0.6.0/ChangeLog.rus new/qmmp-0.6.1/ChangeLog.rus
--- old/qmmp-0.6.0/ChangeLog.rus 2012-06-30 10:56:52.000000000 +0200
+++ new/qmmp-0.6.1/ChangeLog.rus 2012-07-22 20:38:23.000000000 +0200
@@ -633,7 +633,7 @@
* улучшен модуль cue
* интерфейс с поддержкой обложек перенесён в отдельный модуль
* исправлена опция 'скрывать при закрытии'
-* исправлена предупреждения moc во время сборки
+* исправлены предупреждения moc во время сборки
* исправлен IPC под windows
* исправлены windows-специфичные ошибки
* исправлены проблемы с асинхронными вызовами
@@ -646,3 +646,15 @@
* обновлён польский перевод (Grzegorz Gibas)
* обновлён немецкий перевод (Panagiotis Papadopoulos)
* обновлён голландский перевод (Ronald Uitermark)
+
+Версия 0.6.1
+* добавлены значки на кнопки файлового диалога
+* исправлены названия icecast-потоков
+* исправлена сборка
+* исправлен модуль вывода по умолчанию под windows
+* исправлена документация api
+* исправлена возможная ошибка сегментации в модуле cue
+* исправлена поддержка некоторых cue-файлов
+* исправлено автоматическое определение кодировки
+* исправлен украинский перевод (Геннадий Моцьо)
+* исправлен русский перевод
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-0.6.0/ChangeLog.svn new/qmmp-0.6.1/ChangeLog.svn
--- old/qmmp-0.6.0/ChangeLog.svn 2012-06-30 11:11:04.000000000 +0200
+++ new/qmmp-0.6.1/ChangeLog.svn 2012-07-22 20:48:23.000000000 +0200
@@ -1,4 +1,72 @@
------------------------------------------------------------------------
+r2821 | trialuser02 | 2012-07-22 22:39:07 +0400 (Вск, 22 Июл 2012) | 1 line
+
+updated changelog
+------------------------------------------------------------------------
+r2820 | trialuser02 | 2012-07-22 22:32:17 +0400 (Вск, 22 Июл 2012) | 1 line
+
+added icons in the file dialog buttons (backported from trunk)
+------------------------------------------------------------------------
+r2813 | trialuser02 | 2012-07-17 20:35:38 +0400 (Втр, 17 Июл 2012) | 1 line
+
+updated changelog
+------------------------------------------------------------------------
+r2809 | trialuser02 | 2012-07-15 22:43:58 +0400 (Вск, 15 Июл 2012) | 1 line
+
+fixed Russian translation
+------------------------------------------------------------------------
+r2807 | trialuser02 | 2012-07-14 18:40:43 +0400 (Сбт, 14 Июл 2012) | 1 line
+
+fixed documentation
+------------------------------------------------------------------------
+r2800 | trialuser02 | 2012-07-13 20:04:15 +0400 (Птн, 13 Июл 2012) | 1 line
+
+fixed Ukrainian translation (Gennadi Motsyo)(backported from trunk)
+------------------------------------------------------------------------
+r2799 | trialuser02 | 2012-07-13 19:51:29 +0400 (Птн, 13 Июл 2012) | 1 line
+
+fixed automatic charset detection
+------------------------------------------------------------------------
+r2790 | trialuser02 | 2012-07-12 19:36:55 +0400 (Чтв, 12 Июл 2012) | 1 line
+
+fixed incorrect cue parsing
+------------------------------------------------------------------------
+r2788 | trialuser02 | 2012-07-12 00:41:58 +0400 (Чтв, 12 Июл 2012) | 1 line
+
+fixed possible segmentation fault in cue plugin
+------------------------------------------------------------------------
+r2786 | trialuser02 | 2012-07-08 10:29:46 +0400 (Вск, 08 Июл 2012) | 1 line
+
+fixed regression
+------------------------------------------------------------------------
+r2783 | trialuser02 | 2012-07-08 00:11:15 +0400 (Вск, 08 Июл 2012) | 1 line
+
+using /usr/local/include as system include (see freebsd bug #169684)
+------------------------------------------------------------------------
+r2781 | trialuser02 | 2012-07-07 15:56:05 +0400 (Сбт, 07 Июл 2012) | 1 line
+
+fixed regression
+------------------------------------------------------------------------
+r2779 | trialuser02 | 2012-07-07 15:04:21 +0400 (Сбт, 07 Июл 2012) | 1 line
+
+fixed default output under windows
+------------------------------------------------------------------------
+r2775 | trialuser02 | 2012-07-04 19:30:55 +0400 (Срд, 04 Июл 2012) | 1 line
+
+stream browser: show url as alternative for unknown stations
+------------------------------------------------------------------------
+r2768 | trialuser02 | 2012-07-02 16:33:06 +0400 (Пнд, 02 Июл 2012) | 1 line
+
+fixed typo
+------------------------------------------------------------------------
+r2766 | trialuser02 | 2012-06-30 20:11:46 +0400 (Сбт, 30 Июн 2012) | 1 line
+
+fixed api documentation
+------------------------------------------------------------------------
+r2761 | trialuser02 | 2012-06-30 16:13:06 +0400 (Сбт, 30 Июн 2012) | 1 line
+
+version bump
+------------------------------------------------------------------------
r2757 | trialuser02 | 2012-06-30 12:45:53 +0400 (Сбт, 30 Июн 2012) | 1 line
creating 0.6 branch
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-0.6.0/README new/qmmp-0.6.1/README
--- old/qmmp-0.6.0/README 2012-06-30 10:56:52.000000000 +0200
+++ new/qmmp-0.6.1/README 2012-07-14 16:39:35.000000000 +0200
@@ -58,7 +58,9 @@
- ReplayGain support
- Last.fm/Libre.fm scrobbler
- CDDB support
+- audio converter
- stream browser
+- audio formats conveter
Requirements:
- Qt >= 4.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-0.6.0/README.RUS new/qmmp-0.6.1/README.RUS
--- old/qmmp-0.6.0/README.RUS 2012-06-30 10:56:52.000000000 +0200
+++ new/qmmp-0.6.1/README.RUS 2012-07-14 16:39:53.000000000 +0200
@@ -59,6 +59,7 @@
- скробблер Last.fm/Libre.fm
- поддержка CDDB
- обзор потоков
+- преобразователь аудио-форматов
Требования:
- Qt >= 4.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-0.6.0/qmmp.pri new/qmmp-0.6.1/qmmp.pri
--- old/qmmp-0.6.0/qmmp.pri 2012-06-30 11:01:36.000000000 +0200
+++ new/qmmp-0.6.1/qmmp.pri 2012-07-22 20:54:37.000000000 +0200
@@ -7,7 +7,7 @@
#Version
-QMMP_VERSION = 0.6.0
+QMMP_VERSION = 0.6.1
#CONFIG += SVN_VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-0.6.0/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp new/qmmp-0.6.1/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp
--- old/qmmp-0.6.0/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp 2012-06-30 10:54:29.000000000 +0200
+++ new/qmmp-0.6.1/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp 2012-07-22 20:28:16.000000000 +0200
@@ -92,6 +92,12 @@
lookInComboBox->setMaxCount(HISTORY_SIZE);
QCompleter* dir_completer = new QCompleter (m_model, this);
lookInComboBox->setCompleter (dir_completer);
+
+ if(qApp->style()->styleHint(QStyle::SH_DialogButtonBox_ButtonsHaveIcons, 0, this))
+ {
+ addPushButton->setIcon(qApp->style()->standardIcon(QStyle::SP_DialogOpenButton));
+ closePushButton->setIcon(qApp->style()->standardIcon(QStyle::SP_DialogCloseButton));
+ }
}
QmmpFileDialogImpl::~QmmpFileDialogImpl()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-0.6.0/src/plugins/General/streambrowser/streamwindow.cpp new/qmmp-0.6.1/src/plugins/General/streambrowser/streamwindow.cpp
--- old/qmmp-0.6.0/src/plugins/General/streambrowser/streamwindow.cpp 2012-06-30 10:55:35.000000000 +0200
+++ new/qmmp-0.6.1/src/plugins/General/streambrowser/streamwindow.cpp 2012-07-04 17:30:06.000000000 +0200
@@ -316,6 +316,9 @@
{
if (xml.name() == "entry")
{
+ if(server_name == "Unspecified name" || server_name.isEmpty())
+ server_name = listen_url.section("/", -1);
+
model->appendRow(QList ()
<< new QStandardItem(server_name)
<< new QStandardItem(genre)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-0.6.0/src/plugins/Input/cue/cueparser.cpp new/qmmp-0.6.1/src/plugins/Input/cue/cueparser.cpp
--- old/qmmp-0.6.0/src/plugins/Input/cue/cueparser.cpp 2012-06-30 10:53:58.000000000 +0200
+++ new/qmmp-0.6.1/src/plugins/Input/cue/cueparser.cpp 2012-07-13 17:49:50.000000000 +0200
@@ -50,15 +50,15 @@
QTextStream textStream (&file);
QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
settings.beginGroup("CUE");
- QTextCodec *codec = QTextCodec::codecForName(settings.value("encoding","ISO-8859-1").toByteArray ());
- if(!codec)
- codec = QTextCodec::codecForName("UTF-8");
m_dirty = settings.value("dirty_cue", false).toBool();
+ QTextCodec *codec = 0;
#ifdef WITH_ENCA
EncaAnalyser analyser = 0;
if(settings.value("use_enca", false).toBool())
{
analyser = enca_analyser_alloc(settings.value("enca_lang").toByteArray ().constData());
+ enca_set_threshold(analyser, 1.38);
+
if(analyser)
{
EncaEncoding encoding = enca_analyse(analyser,
@@ -74,6 +74,10 @@
}
}
#endif
+ if(!codec)
+ codec = QTextCodec::codecForName(settings.value("encoding","ISO-8859-1").toByteArray ());
+ if(!codec)
+ codec = QTextCodec::codecForName("UTF-8");
settings.endGroup();
//qDebug("CUEParser: using %s encoding", codec->name().constData());
textStream.setCodec(codec);
@@ -284,10 +288,9 @@
return 0;
}
-QString CUEParser::getDirtyPath(const QString &cue, const QString &path)
+QString CUEParser::getDirtyPath(const QString &cue_path, const QString &path)
{
-
- if (Decoder::findByPath(path) || !m_dirty)
+ if((QFile::exists(path) && Decoder::findByPath(path)) || !m_dirty)
return path;
QStringList candidates;
@@ -296,7 +299,7 @@
{
it.next();
QString f = it.filePath();
- if ((f != cue) && Decoder::findByPath(f))
+ if ((f != cue_path) && Decoder::findByPath(f))
candidates.push_back(f);
}
@@ -305,10 +308,10 @@
else if (candidates.count() == 1)
return candidates.first();
- int dot = cue.lastIndexOf('.');
+ int dot = cue_path.lastIndexOf('.');
if (dot != -1)
{
- QRegExp r(QRegExp::escape(cue.left(dot)) + "\\.[^\\.]+$");
+ QRegExp r(QRegExp::escape(cue_path.left(dot)) + "\\.[^\\.]+$");
int index = candidates.indexOf(r);
int rindex = candidates.lastIndexOf(r);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-0.6.0/src/plugins/Input/cue/cueparser.h new/qmmp-0.6.1/src/plugins/Input/cue/cueparser.h
--- old/qmmp-0.6.0/src/plugins/Input/cue/cueparser.h 2012-06-30 10:53:58.000000000 +0200
+++ new/qmmp-0.6.1/src/plugins/Input/cue/cueparser.h 2012-07-12 17:28:06.000000000 +0200
@@ -59,7 +59,7 @@
bool m_dirty;
QStringList splitLine(const QString &line);
qint64 getLength(const QString &str);
- QString getDirtyPath(const QString &cue, const QString &path);
+ QString getDirtyPath(const QString &cue_path, const QString &path);
};
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-0.6.0/src/plugins/Input/mad/translations/mad_plugin_uk_UA.ts new/qmmp-0.6.1/src/plugins/Input/mad/translations/mad_plugin_uk_UA.ts
--- old/qmmp-0.6.0/src/plugins/Input/mad/translations/mad_plugin_uk_UA.ts 2012-06-30 10:53:34.000000000 +0200
+++ new/qmmp-0.6.1/src/plugins/Input/mad/translations/mad_plugin_uk_UA.ts 2012-07-13 18:00:52.000000000 +0200
@@ -151,7 +151,7 @@
<message>
<location filename="../settingsdialog.ui" line="29"/>
<source>Tag Priority</source>
- <translation>Приорітет тєгу</translation>
+ <translation>Пріоритет тегу</translation>
</message>
<message>
<location filename="../settingsdialog.ui" line="41"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-0.6.0/src/plugins/Input/modplug/translations/modplug_plugin_ru.ts new/qmmp-0.6.1/src/plugins/Input/modplug/translations/modplug_plugin_ru.ts
--- old/qmmp-0.6.0/src/plugins/Input/modplug/translations/modplug_plugin_ru.ts 2012-05-25 13:01:37.000000000 +0200
+++ new/qmmp-0.6.1/src/plugins/Input/modplug/translations/modplug_plugin_ru.ts 2012-07-15 20:42:43.000000000 +0200
@@ -26,7 +26,7 @@
<message>
<location filename="../decodermodplugfactory.cpp" line="129"/>
<source>Written by: Ilya Kotov <forkotov02@hotmail.ru></source>
- <translation type="unfinished"></translation>
+ <translation>Разработчик: Илья Котов <forkotov02@hotmail.ru></translation>
</message>
<message>
<location filename="../decodermodplugfactory.cpp" line="130"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-0.6.0/src/plugins/Transports/http/httpstreamreader.cpp new/qmmp-0.6.1/src/plugins/Transports/http/httpstreamreader.cpp
--- old/qmmp-0.6.0/src/plugins/Transports/http/httpstreamreader.cpp 2012-06-30 10:54:04.000000000 +0200
+++ new/qmmp-0.6.1/src/plugins/Transports/http/httpstreamreader.cpp 2012-07-13 17:49:50.000000000 +0200
@@ -129,6 +129,7 @@
m_analyser = 0;
if(settings.value("use_enca", false).toBool())
m_analyser = enca_analyser_alloc(settings.value("enca_lang").toByteArray ().constData());
+ enca_set_threshold(m_analyser, 1.38);
#endif
settings.endGroup();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-0.6.0/src/plugins/Ui/skinned/translations/skinned_plugin_uk_UA.ts new/qmmp-0.6.1/src/plugins/Ui/skinned/translations/skinned_plugin_uk_UA.ts
--- old/qmmp-0.6.0/src/plugins/Ui/skinned/translations/skinned_plugin_uk_UA.ts 2012-06-30 10:55:17.000000000 +0200
+++ new/qmmp-0.6.1/src/plugins/Ui/skinned/translations/skinned_plugin_uk_UA.ts 2012-07-13 18:00:47.000000000 +0200
@@ -471,7 +471,7 @@
<message>
<location filename="../forms/hotkeyeditor.ui" line="40"/>
<source>Change shortcut...</source>
- <translation>Змінити комбінації клавіш...</translation>
+ <translation>Змінити комбінацію клавіш...</translation>
</message>
<message>
<location filename="../hotkeyeditor.cpp" line="55"/>
@@ -1048,7 +1048,7 @@
<message>
<location filename="../forms/shortcutdialog.ui" line="14"/>
<source>Change Shortcut</source>
- <translation>Змінити комбінації клавіш</translation>
+ <translation>Змінити комбінацію клавіш</translation>
</message>
<message>
<location filename="../forms/shortcutdialog.ui" line="29"/>
@@ -1215,7 +1215,7 @@
<message>
<location filename="../forms/skinnedsettings.ui" line="363"/>
<source>Show song numbers</source>
- <translation>Відображати номера пісень</translation>
+ <translation>Відображати номери пісень</translation>
</message>
<message>
<location filename="../forms/skinnedsettings.ui" line="387"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-0.6.0/src/qmmp/output.cpp new/qmmp-0.6.1/src/qmmp/output.cpp
--- old/qmmp-0.6.0/src/qmmp/output.cpp 2012-06-30 10:56:52.000000000 +0200
+++ new/qmmp-0.6.1/src/qmmp/output.cpp 2012-07-08 08:29:17.000000000 +0200
@@ -478,6 +478,8 @@
QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
#ifdef Q_OS_LINUX
QString name = settings.value("Output/current_plugin", "alsa").toString();
+#elif defined Q_WS_WIN
+ QString name = settings.value("Output/current_plugin", "waveout").toString();
#else
QString name = settings.value("Output/current_plugin", "oss4").toString();
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-0.6.0/src/qmmp/outputfactory.h new/qmmp-0.6.1/src/qmmp/outputfactory.h
--- old/qmmp-0.6.0/src/qmmp/outputfactory.h 2012-06-30 10:56:52.000000000 +0200
+++ new/qmmp-0.6.1/src/qmmp/outputfactory.h 2012-06-30 18:11:07.000000000 +0200
@@ -71,7 +71,6 @@
/*!
* Creates volume control object provided by plugin.
* Returns \b 0 if volume control is not supported by plugin.
- * @param parent Parent object.
*/
virtual Volume *createVolume() = 0;
/*!
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-0.6.0/src/qmmp/qmmp.h new/qmmp-0.6.1/src/qmmp/qmmp.h
--- old/qmmp-0.6.0/src/qmmp/qmmp.h 2012-06-30 11:01:58.000000000 +0200
+++ new/qmmp-0.6.1/src/qmmp/qmmp.h 2012-07-22 20:55:32.000000000 +0200
@@ -24,7 +24,7 @@
#define QMMP_VERSION_MAJOR 0
#define QMMP_VERSION_MINOR 6
-#define QMMP_VERSION_PATCH 0
+#define QMMP_VERSION_PATCH 1
#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.6.0/src/qmmpui/aboutdialog_p.h new/qmmp-0.6.1/src/qmmpui/aboutdialog_p.h
--- old/qmmp-0.6.0/src/qmmpui/aboutdialog_p.h 2012-06-30 10:56:40.000000000 +0200
+++ new/qmmp-0.6.1/src/qmmpui/aboutdialog_p.h 2012-06-30 18:11:07.000000000 +0200
@@ -25,6 +25,7 @@
#include "ui_aboutdialog.h"
/**
+ @internal
@author Vladimir Kuznetsov
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-0.6.0/src/qmmpui/configdialog.h new/qmmp-0.6.1/src/qmmpui/configdialog.h
--- old/qmmp-0.6.0/src/qmmpui/configdialog.h 2012-06-30 10:56:40.000000000 +0200
+++ new/qmmp-0.6.1/src/qmmpui/configdialog.h 2012-06-30 18:11:07.000000000 +0200
@@ -32,16 +32,28 @@
class QTreeWidgetItem;
-/**
+/*! @brief Configuration dialog class.
@author Ilya Kotov
*/
class ConfigDialog : public QDialog
{
Q_OBJECT
public:
+ /*!
+ * Constructor.
+ * @param parent Parent widget
+ */
ConfigDialog(QWidget *parent = 0);
+ /*!
+ * Destructor
+ */
virtual ~ConfigDialog();
-
+ /*!
+ * Adds custom page in configuration dialog
+ * @param name Localized name of the custom page
+ * @param widget Custom page instance
+ * @param icon Custom page icon
+ */
void addPage(const QString &name, QWidget *widget, const QIcon &icon = QIcon());
private slots:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-0.6.0/src/qmmpui/jumptotrackdialog_p.h new/qmmp-0.6.1/src/qmmpui/jumptotrackdialog_p.h
--- old/qmmp-0.6.0/src/qmmpui/jumptotrackdialog_p.h 2012-06-30 10:56:40.000000000 +0200
+++ new/qmmp-0.6.1/src/qmmpui/jumptotrackdialog_p.h 2012-06-30 18:11:07.000000000 +0200
@@ -30,6 +30,7 @@
class PlayListModel;
/**
+ @internal
@author Vladimir Kuznetsov
*/
class JumpToTrackDialog : public QDialog, private Ui::JumpToTrackDialog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-0.6.0/src/qmmpui/playlistmodel.h new/qmmp-0.6.1/src/qmmpui/playlistmodel.h
--- old/qmmp-0.6.0/src/qmmpui/playlistmodel.h 2012-06-30 10:56:40.000000000 +0200
+++ new/qmmp-0.6.1/src/qmmpui/playlistmodel.h 2012-06-30 18:11:07.000000000 +0200
@@ -163,7 +163,7 @@
/*!
* Sets the selected state of the item to \b select
* @param row Number of item.
- * @param select Selection state (\b true - select, \b false - unselect)
+ * @param selected Selection state (\b true - select, \b false - unselect)
*/
void setSelected(int row, bool selected = true);
/*!
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-0.6.0/src/qmmpui/uihelper.h new/qmmp-0.6.1/src/qmmpui/uihelper.h
--- old/qmmp-0.6.0/src/qmmpui/uihelper.h 2012-06-30 10:56:40.000000000 +0200
+++ new/qmmp-0.6.1/src/qmmpui/uihelper.h 2012-06-30 18:11:07.000000000 +0200
@@ -87,17 +87,45 @@
* @param parent Parent widget
*/
QMenu *createMenu(MenuType type, const QString &title = QString(), QWidget *parent = 0);
-
+ /*!
+ * Opens 'Add File' dialog
+ * @param parent Parent widget
+ * @param model Destination playlist model
+ */
void addFile(QWidget *parent = qApp->activeWindow(),
PlayListModel *model = PlayListManager::instance()->selectedPlayList());
+ /*!
+ * Opens 'Add Directory' dialog
+ * @param parent Parent widget
+ * @param model Destination playlist model
+ */
void addDirectory(QWidget *parent = qApp->activeWindow(),
PlayListModel *model = PlayListManager::instance()->selectedPlayList());
+ /*!
+ * Opens 'Load Playlist' dialog
+ * @param parent Parent widget
+ * @param model Destination playlist model
+ */
void loadPlayList(QWidget *parent = qApp->activeWindow(),
PlayListModel *model = PlayListManager::instance()->selectedPlayList());
+ /*!
+ * Opens 'Save Playlist' dialog
+ * @param parent Parent widget
+ * @param model Destination playlist model
+ */
void savePlayList(QWidget *parent = qApp->activeWindow(),
PlayListModel *model = PlayListManager::instance()->selectedPlayList());
+ /*!
+ * Opens 'Jump To Track' dialog
+ * @param parent Parent widget
+ * @param model Destination playlist model
+ */
void jumpToTrack(QWidget *parent = qApp->activeWindow(),
PlayListModel *model = PlayListManager::instance()->selectedPlayList());
+ /*!
+ * Shows about dialog
+ * @param parent Parent widget
+ */
void about(QWidget *parent = 0);
/*!
* Returns a pointer to the object's instance.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-0.6.0/src/qmmpui/uiloader.h new/qmmp-0.6.1/src/qmmpui/uiloader.h
--- old/qmmp-0.6.0/src/qmmpui/uiloader.h 2012-06-30 10:56:40.000000000 +0200
+++ new/qmmp-0.6.1/src/qmmpui/uiloader.h 2012-06-30 18:11:07.000000000 +0200
@@ -46,7 +46,6 @@
static void select(UiFactory* factory);
/*!
* Returns \b true if general plugin is enabled, otherwise returns \b false
- * @param factory General plugin factory.
*/
static UiFactory *selected();
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org