Hello community, here is the log from the commit of package artikulate for openSUSE:Factory checked in at 2015-01-21 22:08:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/artikulate (Old) and /work/SRC/openSUSE:Factory/.artikulate.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "artikulate" Changes: -------- --- /work/SRC/openSUSE:Factory/artikulate/artikulate.changes 2015-01-08 23:15:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.artikulate.new/artikulate.changes 2015-01-21 22:08:33.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Jan 12 19:42:23 UTC 2015 - [email protected] + +- Update to KDE Applications 14.12.1 + * KDE Applications 14.12.1 + * See https://www.kde.org/announcements/announce-applications-14.12.1.php + +------------------------------------------------------------------- Old: ---- artikulate-14.12.0.tar.xz New: ---- artikulate-14.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ artikulate.spec ++++++ --- /var/tmp/diff_new_pack.jcWr1f/_old 2015-01-21 22:08:34.000000000 +0100 +++ /var/tmp/diff_new_pack.jcWr1f/_new 2015-01-21 22:08:34.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package artikulate # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: artikulate -Version: 14.12.0 +Version: 14.12.1 Release: 0 Summary: Pronunciation Self-Teaching License: LGPL-3.0+ and GPL-2.0 and BSD-3-Clause ++++++ artikulate-14.12.0.tar.xz -> artikulate-14.12.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/artikulate-14.12.0/libsound/src/outputdevicecontroller.cpp new/artikulate-14.12.1/libsound/src/outputdevicecontroller.cpp --- old/artikulate-14.12.0/libsound/src/outputdevicecontroller.cpp 2014-11-18 07:22:38.000000000 +0100 +++ new/artikulate-14.12.1/libsound/src/outputdevicecontroller.cpp 2015-01-03 17:27:49.000000000 +0100 @@ -128,6 +128,7 @@ { // backend only accepts volume, when there is a pipeline // store value here and set it when playing + d->backend()->setVolume(volume); d->m_volume = volume; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/artikulate-14.12.0/src/mainwindow.cpp new/artikulate-14.12.1/src/mainwindow.cpp --- old/artikulate-14.12.0/src/mainwindow.cpp 2014-11-18 07:22:38.000000000 +0100 +++ new/artikulate-14.12.1/src/mainwindow.cpp 2015-01-03 17:27:49.000000000 +0100 @@ -217,6 +217,8 @@ connect(dialog, SIGNAL(accepted()), appearenceDialog, SLOT(saveSettings())); connect(dialog, SIGNAL(accepted()), SLOT(updateTrainingPhraseFont())); connect(dialog, SIGNAL(accepted()), SLOT(updateKcfgUseContributorResources())); + connect(dialog, SIGNAL(finished()), soundDialog, SLOT(stopPlaying())); + connect(dialog, SIGNAL(finished()), soundDialog, SLOT(stopRecord())); dialog->exec(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/artikulate-14.12.0/src/ui/sounddevicedialogpage.cpp new/artikulate-14.12.1/src/ui/sounddevicedialogpage.cpp --- old/artikulate-14.12.0/src/ui/sounddevicedialogpage.cpp 2014-11-18 07:22:38.000000000 +0100 +++ new/artikulate-14.12.1/src/ui/sounddevicedialogpage.cpp 2015-01-03 17:27:49.000000000 +0100 @@ -61,6 +61,7 @@ m_recordTestFile.open(); // connections + connect(ui->kcfg_AudioOutputVolume, SIGNAL(valueChanged(int)), this, SLOT(setVolume(int))); connect(ui->buttonPlayTestSound, SIGNAL(clicked(bool)), this, SLOT(playTestSound())); connect(ui->buttonPlayRecordedTestSound, SIGNAL(clicked(bool)), this, SLOT(playRecordedSound())); connect(ui->buttonRecordTestSound, SIGNAL(clicked(bool)), this, SLOT(recordSound())); @@ -84,6 +85,11 @@ ui->kcfg_AudioOutputVolume->setValue(Settings::audioOutputVolume()); } +void SoundDeviceDialogPage::setVolume(int volume) +{ + OutputDeviceController::self().setVolume(volume); +} + void SoundDeviceDialogPage::saveSettings() { Settings::setAudioInputDevice(ui->kcfg_AudioInputDevice->itemText(ui->kcfg_AudioInputDevice->currentIndex())); @@ -114,13 +120,16 @@ OutputDeviceController::self().play(KUrl::fromLocalFile(m_recordTestFile.fileName())); } +void SoundDeviceDialogPage::stopPlaying() +{ + OutputDeviceController::self().stop(); +} + void SoundDeviceDialogPage::recordSound() { if (CaptureDeviceController::self().state() == CaptureDeviceController::RecordingState) { - CaptureDeviceController::self().stopCapture(); - ui->buttonRecordTestSound->setIcon(KIcon("media-record")); - ui->buttonPlayRecordedTestSound->setEnabled(true); + stopRecord(); return; } @@ -129,6 +138,15 @@ CaptureDeviceController::self().startCapture(m_recordTestFile.fileName()); } +void SoundDeviceDialogPage::stopRecord() +{ + if (CaptureDeviceController::self().state() == CaptureDeviceController::RecordingState) { + CaptureDeviceController::self().stopCapture(); + ui->buttonRecordTestSound->setIcon(KIcon("media-record")); + ui->buttonPlayRecordedTestSound->setEnabled(true); + } +} + void SoundDeviceDialogPage::updatePlayButtonIcons() { // default sound output test diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/artikulate-14.12.0/src/ui/sounddevicedialogpage.h new/artikulate-14.12.1/src/ui/sounddevicedialogpage.h --- old/artikulate-14.12.0/src/ui/sounddevicedialogpage.h 2014-11-18 07:22:38.000000000 +0100 +++ new/artikulate-14.12.1/src/ui/sounddevicedialogpage.h 2015-01-03 17:27:49.000000000 +0100 @@ -43,6 +43,9 @@ void playRecordedSound(); void recordSound(); void updatePlayButtonIcons(); + void stopPlaying(); + void stopRecord(); + void setVolume(int volume); private: Ui::SoundDeviceDialogPage *ui; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
