Hello community, here is the log from the commit of package kio_audiocd for openSUSE:Factory checked in at 2014-07-16 16:19:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kio_audiocd (Old) and /work/SRC/openSUSE:Factory/.kio_audiocd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kio_audiocd" Changes: -------- --- /work/SRC/openSUSE:Factory/kio_audiocd/kio_audiocd.changes 2014-06-19 13:16:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kio_audiocd.new/kio_audiocd.changes 2014-07-16 16:20:11.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Jul 10 22:16:05 UTC 2014 - cgiboude...@gmx.com + +- Update to 4.13.80 + * KDE 4.14 Beta 1 release + * See http://www.kde.org/announcements/announce-4.14-beta1.php + +------------------------------------------------------------------- Old: ---- audiocd-kio-4.13.2.tar.xz New: ---- audiocd-kio-4.13.80.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kio_audiocd.spec ++++++ --- /var/tmp/diff_new_pack.dbJQcY/_old 2014-07-16 16:20:12.000000000 +0200 +++ /var/tmp/diff_new_pack.dbJQcY/_new 2014-07-16 16:20:12.000000000 +0200 @@ -28,7 +28,7 @@ License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org -Version: 4.13.2 +Version: 4.13.80 Release: 0 Source0: audiocd-kio-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -55,13 +55,15 @@ %files %defattr(-,root,root) +%doc COPYING* +%doc %lang(en) %{_kde4_htmldir}/en/kioslave/ %dir %{_kde4_appsdir}/solid %dir %{_kde4_appsdir}/solid/actions %{_kde4_appsdir}/konqsidebartng/ %{_kde4_appsdir}/solid/actions/solid_audiocd.desktop -%config %{_kde4_configkcfgdir}/audiocd_lame_encoder.kcfg -%config %{_kde4_configkcfgdir}/audiocd_vorbis_encoder.kcfg -%{_kde4_htmldir}/en/kioslave/ +%{_kde4_configkcfgdir}/audiocd_flac_encoder.kcfg +%{_kde4_configkcfgdir}/audiocd_lame_encoder.kcfg +%{_kde4_configkcfgdir}/audiocd_vorbis_encoder.kcfg %{_kde4_includedir}/audiocdencoder.h %{_kde4_libdir}/libaudiocdplugins.* %{_kde4_modulesdir}/kcm_audiocd.so ++++++ audiocd-kio-4.13.2.tar.xz -> audiocd-kio-4.13.80.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/audiocd-kio-4.13.2/audiocd.cpp new/audiocd-kio-4.13.80/audiocd.cpp --- old/audiocd-kio-4.13.2/audiocd.cpp 2014-05-04 09:34:35.000000000 +0200 +++ new/audiocd-kio-4.13.80/audiocd.cpp 2014-06-30 06:41:27.000000000 +0200 @@ -534,6 +534,21 @@ void AudioCDProtocol::stat(const KUrl & url) { struct cdrom_drive * drive = initRequest(url); + + if (!drive && d->device.isEmpty()) { + // This is top level directory with CDROM devices + const mode_t _umask = ::umask(0); + ::umask(_umask); + UDSEntry entry; + entry.insert(KIO::UDSEntry::UDS_NAME, url.fileName().replace(QLatin1Char( '/' ), QLatin1String("%2F"))); + entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR); + entry.insert(KIO::UDSEntry::UDS_ACCESS, (0666 & (~_umask))); + entry.insert(KIO::UDSEntry::UDS_SIZE, 2+encoders.count()); + statEntry(entry); + finished(); + return; + } + if (!drive) return; @@ -610,6 +625,25 @@ { struct cdrom_drive * drive = initRequest(url); + if (!drive && d->device.isEmpty()) { + // List CDROM devices + UDSEntry entry; + const QStringList &deviceNames = KCompactDisc::cdromDeviceNames(); + foreach (const QString &deviceName, deviceNames) { + const QString &device = KCompactDisc::urlToDevice(KCompactDisc::cdromDeviceUrl(deviceName)); + KUrl targetUrl = url; + targetUrl.addQueryItem("device", device); + app_dir(entry, device, 2+encoders.count()); + entry.insert(KIO::UDSEntry::UDS_TARGET_URL, targetUrl.url()); + entry.insert(KIO::UDSEntry::UDS_DISPLAY_NAME, deviceName); + listEntry(entry, false); + } + totalSize(entry.count()); + listEntry(entry, true); + finished(); + return; + } + // Some error checking before proceeding if (!drive) return; @@ -763,20 +797,12 @@ { const QByteArray device(QFile::encodeName(d->device)); - struct cdrom_drive * drive = 0; + if (device.isEmpty()) + return 0; - if (!device.isEmpty() && device != "/" ) - drive = cdda_identify(device, CDDA_MESSAGE_PRINTIT, 0); - else - { - drive = cdda_find_a_cdrom(CDDA_MESSAGE_PRINTIT, 0); + struct cdrom_drive * drive = 0; - if (0 == drive) - { - if (QFile(QFile::decodeName(KCompactDisc::defaultCdromDeviceUrl().url().toAscii())).exists()) - drive = cdda_identify(KCompactDisc::defaultCdromDeviceUrl().url().toAscii(), CDDA_MESSAGE_PRINTIT, 0); - } - } + drive = cdda_identify(device, CDDA_MESSAGE_PRINTIT, 0); if (0 == drive) { kDebug(7117) << "Can't find an audio CD on: \"" << d->device << "\""; @@ -1020,10 +1046,7 @@ const KConfig *config = new KConfig(QLatin1String( "kcmaudiocdrc"), KConfig::NoGlobals ); const KConfigGroup groupCDDA( config, "CDDA" ); - if (!groupCDDA.readEntry("autosearch", true)) { - d->device = groupCDDA.readEntry("device", QString(KCompactDisc::defaultCdromDeviceUrl().url())); - } - + d->device = QString(); // clear device d->paranoiaLevel = 1; // enable paranoia error correction, but allow skipping if (groupCDDA.readEntry("disable_paranoia", false)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/audiocd-kio-4.13.2/data/solid_audiocd.desktop new/audiocd-kio-4.13.80/data/solid_audiocd.desktop --- old/audiocd-kio-4.13.2/data/solid_audiocd.desktop 2014-05-04 09:34:35.000000000 +0200 +++ new/audiocd-kio-4.13.80/data/solid_audiocd.desktop 2014-06-30 06:41:27.000000000 +0200 @@ -37,7 +37,7 @@ Name[nl]=Openen met bestandsbeheerder Name[nn]=Opna i filhandsamar Name[pa]=ਫਾਇਲ ਮੈਨੇਜਰ ਵਿੱਚ ਖੋਲ੍ਹੋ -Name[pl]=Otwórz w zarządcy plików +Name[pl]=Otwórz do zarządzania plikami Name[pt]=Abrir com o Gestor de Ficheiros Name[pt_BR]=Abrir com o gerenciador de arquivos Name[ro]=Deschide cu gestionarul de fișiere diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/audiocd-kio-4.13.2/kcmaudiocd/audiocdconfig.ui new/audiocd-kio-4.13.80/kcmaudiocd/audiocdconfig.ui --- old/audiocd-kio-4.13.2/kcmaudiocd/audiocdconfig.ui 2014-05-04 09:34:35.000000000 +0200 +++ new/audiocd-kio-4.13.80/kcmaudiocd/audiocdconfig.ui 2014-06-30 06:41:27.000000000 +0200 @@ -27,7 +27,7 @@ <string>&General</string> </attribute> <layout class="QGridLayout"> - <item row="4" column="2"> + <item row="3" column="2"> <spacer name="Spacer5"> <property name="orientation"> <enum>Qt::Vertical</enum> @@ -43,7 +43,46 @@ </property> </spacer> </item> - <item row="3" column="0" colspan="3"> + <item row="0" column="0" colspan="3"> + <widget class="QCheckBox" name="ec_enable_check"> + <property name="whatsThis"> + <string>If you uncheck this option, the slave will not try to use error correction which can be useful for reading damaged CDs. However, this feature can be problematic in some cases, so you can switch it off here.</string> + </property> + <property name="text"> + <string>Use &error correction when reading the CD</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="1" column="1" colspan="2"> + <widget class="QCheckBox" name="ec_skip_check"> + <property name="text"> + <string>&Skip on errors</string> + </property> + <property name="checked"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="1" column="0"> + <spacer name="spacer4_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Fixed</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="2" column="0" colspan="3"> <widget class="QGroupBox" name="encoderPriority"> <property name="title"> <string>Encoder Priority</string> @@ -107,68 +146,6 @@ </layout> </widget> </item> - <item row="0" column="2"> - <widget class="QLineEdit" name="cd_device_string"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="whatsThis"> - <string>Specify a location for the drive you want to use. Normally, this is a file inside the /dev folder representing your CD or DVD drive.</string> - </property> - <property name="text"> - <string>/dev/cdrom</string> - </property> - </widget> - </item> - <item row="0" column="0" colspan="2"> - <widget class="QCheckBox" name="cd_autosearch_check"> - <property name="whatsThis"> - <string>Uncheck this if you want to specify a CD device different from the one autoprobed</string> - </property> - <property name="text"> - <string>&Specify CD Device:</string> - </property> - </widget> - </item> - <item row="1" column="0" colspan="3"> - <widget class="QCheckBox" name="ec_enable_check"> - <property name="whatsThis"> - <string>If you uncheck this option, the slave will not try to use error correction which can be useful for reading damaged CDs. However, this feature can be problematic in some cases, so you can switch it off here.</string> - </property> - <property name="text"> - <string>Use &error correction when reading the CD</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="2" column="1" colspan="2"> - <widget class="QCheckBox" name="ec_skip_check"> - <property name="text"> - <string>&Skip on errors</string> - </property> - <property name="checked"> - <bool>false</bool> - </property> - </widget> - </item> - <item row="2" column="0"> - <spacer name="spacer4_2"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Fixed</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <widget class="QWidget" name="tabNames"> @@ -736,7 +713,6 @@ </customwidgets> <tabstops> <tabstop>tabWidget</tabstop> - <tabstop>cd_device_string</tabstop> <tabstop>ec_enable_check</tabstop> <tabstop>ec_skip_check</tabstop> <tabstop>niceLevel</tabstop> @@ -759,22 +735,6 @@ <slot>setEnabled(bool)</slot> <hints> <hint type="sourcelabel"> - <x>20</x> - <y>20</y> - </hint> - <hint type="destinationlabel"> - <x>20</x> - <y>20</y> - </hint> - </hints> - </connection> - <connection> - <sender>cd_autosearch_check</sender> - <signal>toggled(bool)</signal> - <receiver>cd_device_string</receiver> - <slot>setEnabled(bool)</slot> - <hints> - <hint type="sourcelabel"> <x>20</x> <y>20</y> </hint> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/audiocd-kio-4.13.2/kcmaudiocd/kcmaudiocd.cpp new/audiocd-kio-4.13.80/kcmaudiocd/kcmaudiocd.cpp --- old/audiocd-kio-4.13.2/kcmaudiocd/kcmaudiocd.cpp 2014-05-04 09:34:35.000000000 +0200 +++ new/audiocd-kio-4.13.80/kcmaudiocd/kcmaudiocd.cpp 2014-06-30 06:41:27.000000000 +0200 @@ -78,10 +78,8 @@ } //CDDA Options - connect(audioConfig->cd_autosearch_check,SIGNAL(clicked()),this,SLOT(slotConfigChanged())); connect(audioConfig->ec_enable_check,SIGNAL(clicked()),this,SLOT(slotEcEnable())); connect(audioConfig->ec_skip_check,SIGNAL(clicked()),SLOT(slotConfigChanged())); - connect(audioConfig->cd_device_string,SIGNAL(textChanged(QString)),SLOT(slotConfigChanged())); connect(audioConfig->niceLevel,SIGNAL(valueChanged(int)),SLOT(slotConfigChanged())); // File Name @@ -141,9 +139,6 @@ } void KAudiocdModule::defaults() { - audioConfig->cd_autosearch_check->setChecked(true); - audioConfig->cd_device_string->setText("/dev/cdrom"); - audioConfig->ec_enable_check->setChecked(true); audioConfig->ec_skip_check->setChecked(false); audioConfig->niceLevel->setValue(0); @@ -165,8 +160,6 @@ { KConfigGroup cg(config, "CDDA"); - cg.writeEntry("autosearch",audioConfig->cd_autosearch_check->isChecked()); - cg.writeEntry("device",audioConfig->cd_device_string->text()); cg.writeEntry("disable_paranoia",!(audioConfig->ec_enable_check->isChecked())); cg.writeEntry("never_skip",!(audioConfig->ec_skip_check->isChecked())); cg.writeEntry("niceLevel", audioConfig->niceLevel->value()); @@ -212,8 +205,6 @@ { KConfigGroup cg(config, "CDDA"); - audioConfig->cd_autosearch_check->setChecked(cg.readEntry("autosearch",true)); - audioConfig->cd_device_string->setText(cg.readEntry("device","/dev/cdrom")); audioConfig->ec_enable_check->setChecked(!(cg.readEntry("disable_paranoia",false))); audioConfig->ec_skip_check->setChecked(!(cg.readEntry("never_skip",true))); audioConfig->niceLevel->setValue(cg.readEntry("niceLevel", 0)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/audiocd-kio-4.13.2/plugins/flac/CMakeLists.txt new/audiocd-kio-4.13.80/plugins/flac/CMakeLists.txt --- old/audiocd-kio-4.13.2/plugins/flac/CMakeLists.txt 2014-05-04 09:34:35.000000000 +0200 +++ new/audiocd-kio-4.13.80/plugins/flac/CMakeLists.txt 2014-06-30 06:41:27.000000000 +0200 @@ -9,6 +9,9 @@ set(audiocd_encoder_flac_PART_SRCS encoderflac.cpp ) +kde4_add_ui_files(audiocd_encoder_flac_PART_SRCS encoderflacconfig.ui) + +kde4_add_kcfg_files(audiocd_encoder_flac_PART_SRCS audiocd_flac_encoder.kcfgc) kde4_add_plugin(audiocd_encoder_flac WITH_PREFIX ${audiocd_encoder_flac_PART_SRCS}) @@ -18,3 +21,5 @@ install(TARGETS audiocd_encoder_flac DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(FILES audiocd_flac_encoder.kcfg DESTINATION ${KCFG_INSTALL_DIR}) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/audiocd-kio-4.13.2/plugins/flac/audiocd_flac_encoder.kcfg new/audiocd-kio-4.13.80/plugins/flac/audiocd_flac_encoder.kcfg --- old/audiocd-kio-4.13.2/plugins/flac/audiocd_flac_encoder.kcfg 1970-01-01 01:00:00.000000000 +0100 +++ new/audiocd-kio-4.13.80/plugins/flac/audiocd_flac_encoder.kcfg 2014-06-30 06:41:27.000000000 +0200 @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 + http://www.kde.org/standards/kcfg/1.0/kcfg.xsd"; > + <kcfgfile name="kcmaudiocd_encoder_flac_rc"/> + <group name="Flac"> + <entry name="flac_compression_level" type="UInt"> + <label>Flac compression level</label> + <default>5</default> + <min>0</min> + <max>8</max> + </entry> + </group> +</kcfg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/audiocd-kio-4.13.2/plugins/flac/audiocd_flac_encoder.kcfgc new/audiocd-kio-4.13.80/plugins/flac/audiocd_flac_encoder.kcfgc --- old/audiocd-kio-4.13.2/plugins/flac/audiocd_flac_encoder.kcfgc 1970-01-01 01:00:00.000000000 +0100 +++ new/audiocd-kio-4.13.80/plugins/flac/audiocd_flac_encoder.kcfgc 2014-06-30 06:41:27.000000000 +0200 @@ -0,0 +1,4 @@ +# Code generation options for kconfig_compiler +File=audiocd_flac_encoder.kcfg +ClassName=Settings +Singleton=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/audiocd-kio-4.13.2/plugins/flac/encoderflac.cpp new/audiocd-kio-4.13.80/plugins/flac/encoderflac.cpp --- old/audiocd-kio-4.13.2/plugins/flac/encoderflac.cpp 2014-05-04 09:34:35.000000000 +0200 +++ new/audiocd-kio-4.13.80/plugins/flac/encoderflac.cpp 2014-06-30 06:41:27.000000000 +0200 @@ -26,6 +26,10 @@ #include <FLAC/metadata.h> #include <FLAC/stream_encoder.h> +#if defined(FLAC_API_VERSION_CURRENT) && FLAC_API_VERSION_CURRENT > 7 +#include "audiocd_flac_encoder.h" +#endif + #include <kconfig.h> #include <kdebug.h> #include <QPair> @@ -46,6 +50,9 @@ FLAC__StreamMetadata** metadata; KIO::SlaveBase* ioslave; unsigned long data; +#if defined(FLAC_API_VERSION_CURRENT) && FLAC_API_VERSION_CURRENT > 7 + unsigned compression_level; +#endif }; static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder, @@ -97,6 +104,9 @@ d = new Private(); d->ioslave = slave; d->encoder = 0; +#if defined(FLAC_API_VERSION_CURRENT) && FLAC_API_VERSION_CURRENT > 7 + d->compression_level = 5; +#endif } EncoderFLAC::~EncoderFLAC() { @@ -104,6 +114,17 @@ delete d; } +QWidget* EncoderFLAC::getConfigureWidget(KConfigSkeleton** manager) const { +#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7 + Q_UNUSED(manager); + return NULL; +#else + (*manager) = Settings::self(); + KGlobal::locale()->insertCatalog( QLatin1String( "audiocd_encoder_flac" )); + return new EncoderFLACConfig(); +#endif +} + bool EncoderFLAC::init(){ d->encoder = FLAC__stream_encoder_new(); d->metadata = 0; @@ -112,8 +133,11 @@ } void EncoderFLAC::loadSettings() { -// config->setGroup("FLAC"); - +#if defined(FLAC_API_VERSION_CURRENT) && FLAC_API_VERSION_CURRENT > 7 + Settings *settings = Settings::self(); + d->compression_level = settings->flac_compression_level(); + if (d->compression_level > 8) d->compression_level = 5; +#endif } // Estimate size to be 5/8 of uncompresed size. @@ -131,13 +155,16 @@ FLAC__stream_encoder_set_client_data(d->encoder, d); #endif - // The options match approximely those of flac compression-level-3 +#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7 + // The options match approximely those of flac compression-level-5 FLAC__stream_encoder_set_do_mid_side_stereo(d->encoder, true); - FLAC__stream_encoder_set_loose_mid_side_stereo(d->encoder, true); // flac -M - FLAC__stream_encoder_set_max_lpc_order(d->encoder, 6); // flac -l6 + FLAC__stream_encoder_set_max_lpc_order(d->encoder, 8); // flac -l8 FLAC__stream_encoder_set_min_residual_partition_order(d->encoder, 3); FLAC__stream_encoder_set_max_residual_partition_order(d->encoder, 3); // flac -r3,3 - FLAC__stream_encoder_set_blocksize(d->encoder, 4608); +#else + FLAC__stream_encoder_set_compression_level(d->encoder, d->compression_level); +#endif + FLAC__stream_encoder_set_streamable_subset(d->encoder, true); if (size > 0) FLAC__stream_encoder_set_total_samples_estimate(d->encoder, size/4); @@ -183,16 +210,16 @@ // d->metadata[2] = FLAC__metadata_object_new(FLAC__METADATA_TYPE_SEEKTABLE) typedef QPair<QString, QVariant> Comment; - Comment comments[7] = { Comment(QLatin1String( "Title" ), info.track(track-1).get(Title)), - Comment(QLatin1String( "Artist" ), info.track(track-1).get(Artist)), - Comment(QLatin1String( "Album" ), info.get(Title)), - Comment(QLatin1String( "Genre" ), info.get(Genre)), - Comment(QLatin1String( "Tracknumber" ), QString::number(track)), - Comment(QLatin1String( "Comment" ), comment), - Comment(QLatin1String( "Date" ), QVariant(QString::null) )}; //krazy:exclude=nullstrassign for old broken gcc + Comment comments[7] = { Comment(QLatin1String( "TITLE" ), info.track(track-1).get(Title)), + Comment(QLatin1String( "ARTIST" ), info.track(track-1).get(Artist)), + Comment(QLatin1String( "ALBUM" ), info.get(Title)), + Comment(QLatin1String( "GENRE" ), info.get(Genre)), + Comment(QLatin1String( "TRACKNUMBER" ), QString::number(track)), + Comment(QLatin1String( "COMMENT" ), comment), + Comment(QLatin1String( "DATE" ), QVariant(QString::null) )}; //krazy:exclude=nullstrassign for old broken gcc if (info.get(Year).toInt() > 0) { QDateTime dt(QDate(info.get(Year).toInt(), 1, 1)); - comments[6] = Comment(QLatin1String( "Date" ), dt.toString(Qt::ISODate)); + comments[6] = Comment(QLatin1String( "DATE" ), dt.toString(Qt::ISODate)); } FLAC__StreamMetadata_VorbisComment_Entry entry; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/audiocd-kio-4.13.2/plugins/flac/encoderflac.h new/audiocd-kio-4.13.80/plugins/flac/encoderflac.h --- old/audiocd-kio-4.13.2/plugins/flac/encoderflac.h 2014-05-04 09:34:35.000000000 +0200 +++ new/audiocd-kio-4.13.80/plugins/flac/encoderflac.h 2014-06-30 06:41:27.000000000 +0200 @@ -25,8 +25,15 @@ #ifdef HAVE_LIBFLAC +#include "ui_encoderflacconfig.h" + #include <audiocdencoder.h> +class EncoderFLACConfig : public QWidget, public Ui::EncoderFLACConfig { +public: + explicit EncoderFLACConfig(QWidget *parent = 0) : QWidget( parent ) { setupUi( this ); } +}; + /** * FLAC encoder. * This encoder is only enabled when HAVE_LIBFLAC is set. @@ -48,6 +55,7 @@ virtual long readInit(long size); virtual long read(int16_t * buf, int frames); virtual long readCleanup(); + virtual QWidget* getConfigureWidget(KConfigSkeleton** manager) const; class Private; private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/audiocd-kio-4.13.2/plugins/flac/encoderflacconfig.ui new/audiocd-kio-4.13.80/plugins/flac/encoderflacconfig.ui --- old/audiocd-kio-4.13.2/plugins/flac/encoderflacconfig.ui 1970-01-01 01:00:00.000000000 +0100 +++ new/audiocd-kio-4.13.80/plugins/flac/encoderflacconfig.ui 2014-06-30 06:41:27.000000000 +0200 @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>EncoderFLACConfig</class> + <widget class="QWidget" name="EncoderFLACConfig"> + <layout class="QVBoxLayout" name="mainLayout"> + <item> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>Flac compression level</string> + </property> + <layout class="QVBoxLayout" name="groupBoxLayout"> + <item> + <widget class="KIntNumInput" name="kcfg_flac_compression_level"> + <property name="value"> + <number>5</number> + </property> + <property name="minimum"> + <number>0</number> + </property> + <property name="maximum"> + <number>8</number> + </property> + <property name="sliderEnabled"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + </item> + </layout> + </widget> + <customwidgets> + <customwidget> + <class>KIntNumInput</class> + <extends>QWidget</extends> + <header>knuminput.h</header> + </customwidget> + </customwidgets> + <resources/> + <connections/> +</ui> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/audiocd-kio-4.13.2/plugins/vorbis/encodervorbis.cpp new/audiocd-kio-4.13.80/plugins/vorbis/encodervorbis.cpp --- old/audiocd-kio-4.13.2/plugins/vorbis/encodervorbis.cpp 2014-05-04 09:34:35.000000000 +0200 +++ new/audiocd-kio-4.13.80/plugins/vorbis/encodervorbis.cpp 2014-06-30 06:41:27.000000000 +0200 @@ -275,16 +275,16 @@ typedef QPair<QByteArray, QVariant> CommentField; QList<CommentField> commentFields; - commentFields.append(CommentField("title", info.track(track-1).get(Title))); - commentFields.append(CommentField("artist", info.track(track-1).get(Artist))); - commentFields.append(CommentField("album", info.get(Title))); - commentFields.append(CommentField("genre", info.get(Genre))); - commentFields.append(CommentField("tracknumber", QString::number(track))); - commentFields.append(CommentField("comment", comment)); + commentFields.append(CommentField("TITLE", info.track(track-1).get(Title))); + commentFields.append(CommentField("ARTIST", info.track(track-1).get(Artist))); + commentFields.append(CommentField("ALBUM", info.get(Title))); + commentFields.append(CommentField("GENRE", info.get(Genre))); + commentFields.append(CommentField("TRACKNUMBER", QString::number(track))); + commentFields.append(CommentField("COMMENT", comment)); if (info.get(Year).toInt() > 0) { QDateTime dt( QDate(info.get(Year).toInt(), 1, 1) ); - commentFields.append(CommentField("date",QLatin1String( dt.toString(Qt::ISODate).toUtf8().data() ))); + commentFields.append(CommentField("DATE",QLatin1String( dt.toString(Qt::ISODate).toUtf8().data() ))); } for(QList<CommentField>::iterator it = commentFields.begin(); it != commentFields.end(); ++it) { -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
