From b910af1bdaec776ddf607569bae4f87467835c5b Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Tue, 1 Oct 2019 12:25:07 -0400 Subject: [PATCH] 2019-10-01 Fred Gleason * Removed the 'RDAudioSettingsDialog' class. --- ChangeLog | 2 + lib/Makefile.am | 2 - lib/lib.pro | 2 - lib/rdaudiosettings_dialog.cpp | 504 --------------------------------- lib/rdaudiosettings_dialog.h | 57 ---- rdadmin/edit_settings.cpp | 3 +- 6 files changed, 3 insertions(+), 567 deletions(-) delete mode 100644 lib/rdaudiosettings_dialog.cpp delete mode 100644 lib/rdaudiosettings_dialog.h diff --git a/ChangeLog b/ChangeLog index 8180e625..3c2085b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19130,3 +19130,5 @@ * Added an 'RDWidget' class. * Refactored rdadmin(1) to use 'RDDialog' and 'RDWidget' base classes. +2019-10-01 Fred Gleason + * Removed the 'RDAudioSettingsDialog' class. diff --git a/lib/Makefile.am b/lib/Makefile.am index 99f8dc64..4a146010 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -67,7 +67,6 @@ dist_librd_la_SOURCES = dbversion.h\ rdaudioexport.cpp rdaudioexport.h\ rdaudioimport.cpp rdaudioimport.h\ rdaudioinfo.cpp rdaudioinfo.h\ - rdaudiosettings_dialog.cpp rdaudiosettings_dialog.h\ rdaudiosettings.cpp rdaudiosettings.h\ rdaudiostore.cpp rdaudiostore.h\ rdbusybar.cpp rdbusybar.h\ @@ -252,7 +251,6 @@ nodist_librd_la_SOURCES = moc_rdadd_cart.cpp\ moc_rdaudioexport.cpp\ moc_rdaudioimport.cpp\ moc_rdaudioinfo.cpp\ - moc_rdaudiosettings_dialog.cpp\ moc_rdaudiostore.cpp\ moc_rdbusybar.cpp\ moc_rdbusydialog.cpp\ diff --git a/lib/lib.pro b/lib/lib.pro index 1fe77ef1..d4ef3798 100644 --- a/lib/lib.pro +++ b/lib/lib.pro @@ -44,7 +44,6 @@ SOURCES += rdapplication.cpp SOURCES += rdaudio_exists.cpp SOURCES += rdaudio_port.cpp SOURCES += rdaudiosettings.cpp -SOURCES += rdaudiosettings_dialog.cpp SOURCES += rdbusybar.cpp SOURCES += rdbusydialog.cpp SOURCES += rdbutton_dialog.cpp @@ -178,7 +177,6 @@ HEADERS += rdapplication.h HEADERS += rdaudio_exists.h HEADERS += rdaudio_port.h HEADERS += rdaudiosettings.h -HEADERS += rdaudiosettings_dialog.h HEADERS += rdbusybar.h HEADERS += rdbusydialog.h HEADERS += rdbutton_dialog.h diff --git a/lib/rdaudiosettings_dialog.cpp b/lib/rdaudiosettings_dialog.cpp deleted file mode 100644 index 0f37841f..00000000 --- a/lib/rdaudiosettings_dialog.cpp +++ /dev/null @@ -1,504 +0,0 @@ -// rdaudiosettings_dialog.cpp -// -// Edit an RDAudioSettings object. -// -// (C) Copyright 2002-2003,2016 Fred Gleason -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Library General Public License -// version 2 as published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public -// License along with this program; if not, write to the Free Software -// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -// - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - - -RDAudioSettingsDialog::RDAudioSettingsDialog(RDAudioSettings *settings, - bool mpeg,QWidget *parent) - : QDialog(parent,"",true) -{ - lib_lib=settings; - - // - // Dialog Name - // - setCaption(tr("Edit Settings")); - - // - // Fix the Window Size - // - setMinimumWidth(sizeHint().width()); - setMaximumWidth(sizeHint().width()); - setMinimumHeight(sizeHint().height()); - setMaximumHeight(sizeHint().height()); - - // - // Generate Fonts - // - QFont font=QFont("Helvetica",12,QFont::Normal); - font.setPixelSize(12); - QFont button_font=QFont("Helvetica",12,QFont::Bold); - font.setPixelSize(12); - - // - // Default Format - // - lib_format_box=new QComboBox(this,"lib_name_edit"); - lib_format_box->setGeometry(150,10,150,20); - lib_format_box->setFont(font); - connect(lib_format_box,SIGNAL(activated(int)),this,SLOT(formatData(int))); - QLabel *lib_format_label=new QLabel(lib_format_box,tr("Default &Format:"), - this,"lib_format_label"); - lib_format_label->setGeometry(25,10,120,20); - lib_format_label->setFont(font); - lib_format_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); - - // - // Default Channels - // - lib_channels_box=new QComboBox(this,"lib_name_edit"); - lib_channels_box->setGeometry(150,32,60,20); - lib_channels_box->setFont(font); - QLabel *lib_channels_label=new QLabel(lib_channels_box, - tr("Default &Channels:"), - this,"lib_channels_label"); - lib_channels_label->setGeometry(25,32,120,20); - lib_channels_label->setFont(font); - lib_channels_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); - - // - // Default Sample Rate - // - lib_samprate_box=new QComboBox(this,"lib_name_edit"); - lib_samprate_box->setGeometry(150,54,100,20); - lib_samprate_box->setFont(font); - QLabel *lib_samprate_label= - new QLabel(lib_samprate_box,tr("Default &Sample Rate:"),this, - "lib_samprate_label"); - lib_samprate_label->setGeometry(20,54,125,20); - lib_samprate_label->setFont(font); - lib_samprate_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); - - // - // Default Bitrate - // - lib_bitrate_box=new QComboBox(this,"lib_name_edit"); - lib_bitrate_box->setGeometry(150,76,100,20); - lib_bitrate_box->setFont(font); - QLabel *lib_bitrate_label= - new QLabel(lib_bitrate_box,tr("Default &Bitrate:"),this, - "lib_bitrate_label"); - lib_bitrate_label->setGeometry(25,76,120,20); - lib_bitrate_label->setFont(font); - lib_bitrate_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); - - // - // Ok Button - // - QPushButton *ok_button=new QPushButton(this,"ok_button"); - ok_button->setGeometry(145,108,80,50); - ok_button->setDefault(true); - ok_button->setFont(button_font); - ok_button->setText(tr("&OK")); - connect(ok_button,SIGNAL(clicked()),this,SLOT(okData())); - - // - // Cancel Button - // - QPushButton *cancel_button=new QPushButton(this,"cancel_button"); - cancel_button->setGeometry(235,108,80,50); - cancel_button->setFont(button_font); - cancel_button->setText(tr("&Cancel")); - connect(cancel_button,SIGNAL(clicked()),this,SLOT(cancelData())); - - // - // Populate Fields - // - lib_format_box->insertItem(tr("PCM16")); -#ifdef HAVE_VORBIS - lib_format_box->insertItem(tr("OggVorbis")); -#endif // HAVE_VORBIS - if(mpeg) { - lib_format_box->insertItem(tr("MPEG Layer 2")); - lib_format_box->insertItem(tr("MPEG Layer 3")); - } - QString str; - switch(lib_lib->format()) { - case RDAudioSettings::Pcm16: - str="PCM16"; - break; - - case RDAudioSettings::OggVorbis: - str="OggVorbis"; - break; - - case RDAudioSettings::Layer1: - str="MPEG Layer 1"; - break; - - case RDAudioSettings::Layer2: - str="MPEG Layer 2"; - break; - - case RDAudioSettings::Layer3: - str="MPEG Layer 3"; - break; - } - for(int i=0;icount();i++) { - if(lib_format_box->text(i)==str) { - lib_format_box->setCurrentItem(i); - } - } - lib_channels_box->insertItem("1"); - lib_channels_box->insertItem("2"); - lib_channels_box->setCurrentItem(lib_lib->channels()-1); - lib_samprate_box->insertItem("32000"); - lib_samprate_box->insertItem("44100"); - lib_samprate_box->insertItem("48000"); - switch(lib_lib->sampleRate()) { - case 32000: - lib_samprate_box->setCurrentItem(0); - break; - - case 44100: - lib_samprate_box->setCurrentItem(1); - break; - - case 48000: - lib_samprate_box->setCurrentItem(2); - break; - } - ShowBitRates(lib_lib->format(),lib_lib->bitRate()); -} - - -RDAudioSettingsDialog::~RDAudioSettingsDialog() -{ - delete lib_channels_box; - delete lib_samprate_box; - delete lib_bitrate_box; -} - - -QSize RDAudioSettingsDialog::sizeHint() const -{ - return QSize(325,168); -} - - -QSizePolicy RDAudioSettingsDialog::sizePolicy() const -{ - return QSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed); -} - - -void RDAudioSettingsDialog::formatData(int index) -{ - ShowBitRates(ReadFormat(),lib_lib->bitRate()); -} - - -void RDAudioSettingsDialog::okData() -{ - unsigned rate=0; - lib_lib->setFormat(ReadFormat()); - lib_lib->setChannels(lib_channels_box->currentItem()+1); - sscanf(lib_samprate_box->currentText(),"%d",&rate); - lib_lib->setSampleRate(rate); - rate=0; - switch(lib_lib->format()) { - case RDAudioSettings::Layer1: - case RDAudioSettings::Layer2: - case RDAudioSettings::Layer3: - sscanf(lib_bitrate_box->currentText(),"%d",&rate); - break; - - default: - break; - } - lib_lib->setBitRate(rate*1000); - done(0); -} - - -void RDAudioSettingsDialog::cancelData() -{ - done(1); -} - - -void RDAudioSettingsDialog::ShowBitRates(RDAudioSettings::Format fmt,int rate) -{ - lib_bitrate_box->clear(); - switch(fmt) { - case RDAudioSettings::Pcm16: - case RDAudioSettings::OggVorbis: - lib_bitrate_box->setDisabled(true); - break; - - case RDAudioSettings::Layer1: - lib_bitrate_box->setEnabled(true); - lib_bitrate_box->insertItem("32 kbps"); - lib_bitrate_box->insertItem("64 kbps"); - lib_bitrate_box->insertItem("96 kbps"); - lib_bitrate_box->insertItem("128 kbps"); - lib_bitrate_box->insertItem("160 kbps"); - lib_bitrate_box->insertItem("192 kbps"); - lib_bitrate_box->insertItem("224 kbps"); - lib_bitrate_box->insertItem("256 kbps"); - lib_bitrate_box->insertItem("288 kbps"); - lib_bitrate_box->insertItem("320 kbps"); - lib_bitrate_box->insertItem("352 kbps"); - lib_bitrate_box->insertItem("384 kbps"); - lib_bitrate_box->insertItem("416 kbps"); - lib_bitrate_box->insertItem("448 kbps"); - switch(lib_lib->bitRate()) { - case 32000: - lib_bitrate_box->setCurrentItem(0); - break; - - case 64000: - lib_bitrate_box->setCurrentItem(1); - break; - - case 96000: - lib_bitrate_box->setCurrentItem(2); - break; - - case 128000: - lib_bitrate_box->setCurrentItem(3); - break; - - case 160000: - lib_bitrate_box->setCurrentItem(4); - break; - - case 192000: - lib_bitrate_box->setCurrentItem(5); - break; - - case 224000: - lib_bitrate_box->setCurrentItem(6); - break; - - case 256000: - lib_bitrate_box->setCurrentItem(7); - break; - - case 288000: - lib_bitrate_box->setCurrentItem(8); - break; - - case 320000: - lib_bitrate_box->setCurrentItem(9); - break; - - case 352000: - lib_bitrate_box->setCurrentItem(10); - break; - - case 384000: - lib_bitrate_box->setCurrentItem(11); - break; - - case 416000: - lib_bitrate_box->setCurrentItem(12); - break; - - case 448000: - lib_bitrate_box->setCurrentItem(13); - break; - } - break; - - case RDAudioSettings::Layer2: - lib_bitrate_box->setEnabled(true); - lib_bitrate_box->insertItem("32 kbps"); - lib_bitrate_box->insertItem("48 kbps"); - lib_bitrate_box->insertItem("56 kbps"); - lib_bitrate_box->insertItem("64 kbps"); - lib_bitrate_box->insertItem("80 kbps"); - lib_bitrate_box->insertItem("96 kbps"); - lib_bitrate_box->insertItem("112 kbps"); - lib_bitrate_box->insertItem("128 kbps"); - lib_bitrate_box->insertItem("160 kbps"); - lib_bitrate_box->insertItem("192 kbps"); - lib_bitrate_box->insertItem("224 kbps"); - lib_bitrate_box->insertItem("256 kbps"); - lib_bitrate_box->insertItem("320 kbps"); - lib_bitrate_box->insertItem("384 kbps"); - switch(lib_lib->bitRate()) { - case 32000: - lib_bitrate_box->setCurrentItem(0); - break; - - case 48000: - lib_bitrate_box->setCurrentItem(1); - break; - - case 56000: - lib_bitrate_box->setCurrentItem(2); - break; - - case 64000: - lib_bitrate_box->setCurrentItem(3); - break; - - case 80000: - lib_bitrate_box->setCurrentItem(4); - break; - - case 96000: - lib_bitrate_box->setCurrentItem(5); - break; - - case 112000: - lib_bitrate_box->setCurrentItem(6); - break; - - case 128000: - lib_bitrate_box->setCurrentItem(7); - break; - - case 160000: - lib_bitrate_box->setCurrentItem(8); - break; - - case 192000: - lib_bitrate_box->setCurrentItem(9); - break; - - case 224000: - lib_bitrate_box->setCurrentItem(10); - break; - - case 256000: - lib_bitrate_box->setCurrentItem(11); - break; - - case 320000: - lib_bitrate_box->setCurrentItem(12); - break; - - case 384000: - lib_bitrate_box->setCurrentItem(13); - break; - } - break; - - case RDAudioSettings::Layer3: - lib_bitrate_box->setEnabled(true); - lib_bitrate_box->insertItem("32 kbps"); - lib_bitrate_box->insertItem("40 kbps"); - lib_bitrate_box->insertItem("48 kbps"); - lib_bitrate_box->insertItem("56 kbps"); - lib_bitrate_box->insertItem("64 kbps"); - lib_bitrate_box->insertItem("80 kbps"); - lib_bitrate_box->insertItem("96 kbps"); - lib_bitrate_box->insertItem("112 kbps"); - lib_bitrate_box->insertItem("128 kbps"); - lib_bitrate_box->insertItem("160 kbps"); - lib_bitrate_box->insertItem("192 kbps"); - lib_bitrate_box->insertItem("224 kbps"); - lib_bitrate_box->insertItem("256 kbps"); - lib_bitrate_box->insertItem("320 kbps"); - switch(lib_lib->bitRate()) { - case 32000: - lib_bitrate_box->setCurrentItem(0); - break; - - case 40000: - lib_bitrate_box->setCurrentItem(1); - break; - - case 48000: - lib_bitrate_box->setCurrentItem(2); - break; - - case 56000: - lib_bitrate_box->setCurrentItem(3); - break; - - case 64000: - lib_bitrate_box->setCurrentItem(4); - break; - - case 80000: - lib_bitrate_box->setCurrentItem(5); - break; - - case 96000: - lib_bitrate_box->setCurrentItem(6); - break; - - case 112000: - lib_bitrate_box->setCurrentItem(7); - break; - - case 128000: - lib_bitrate_box->setCurrentItem(8); - break; - - case 160000: - lib_bitrate_box->setCurrentItem(9); - break; - - case 192000: - lib_bitrate_box->setCurrentItem(10); - break; - - case 224000: - lib_bitrate_box->setCurrentItem(11); - break; - - case 256000: - lib_bitrate_box->setCurrentItem(12); - break; - - case 320000: - lib_bitrate_box->setCurrentItem(13); - break; - } - break; - - } -} - - -RDAudioSettings::Format RDAudioSettingsDialog::ReadFormat() -{ - if(lib_format_box->currentText()==tr("PCM16")) { - return RDAudioSettings::Pcm16; - } - if(lib_format_box->currentText()==tr("OggVorbis")) { - return RDAudioSettings::OggVorbis; - } - if(lib_format_box->currentText()==tr("MPEG Layer 2")) { - return RDAudioSettings::Layer2; - } - if(lib_format_box->currentText()==tr("MPEG Layer 3")) { - return RDAudioSettings::Layer3; - } - return RDAudioSettings::Pcm16; -} diff --git a/lib/rdaudiosettings_dialog.h b/lib/rdaudiosettings_dialog.h deleted file mode 100644 index 75e2829b..00000000 --- a/lib/rdaudiosettings_dialog.h +++ /dev/null @@ -1,57 +0,0 @@ -// rdaudiosettings_dialog.h -// -// Edit Rivendell Audio Settings -// -// (C) Copyright 2002-2003,2016 Fred Gleason -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Library General Public License -// version 2 as published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public -// License along with this program; if not, write to the Free Software -// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -// - -#ifndef RDAUDIOSETTINGS_DIALOG_H -#define RDAUDIOSETTINGS_DIALOG_H - -#include -#include -#include -#include -#include - - -class RDAudioSettingsDialog : public QDialog -{ - Q_OBJECT - public: - RDAudioSettingsDialog(RDAudioSettings *settings,bool mpeg=true, - QWidget *parent=0); - ~RDAudioSettingsDialog(); - QSize sizeHint() const; - QSizePolicy sizePolicy() const; - - private slots: - void formatData(int); - void okData(); - void cancelData(); - - private: - void ShowBitRates(RDAudioSettings::Format fmt,int rate); - RDAudioSettings::Format ReadFormat(); - RDAudioSettings *lib_lib; - QComboBox *lib_format_box; - QComboBox *lib_channels_box; - QComboBox *lib_bitrate_box; - QComboBox *lib_samprate_box; -}; - - -#endif // RDAUDIOSETTINGS_DIALOG_H diff --git a/rdadmin/edit_settings.cpp b/rdadmin/edit_settings.cpp index 2907afec..98ff828c 100644 --- a/rdadmin/edit_settings.cpp +++ b/rdadmin/edit_settings.cpp @@ -1,4 +1,4 @@ -// edit_station.cpp +// edit_settings.cpp // // Edit Rivendell System-Wide Configuration // @@ -23,7 +23,6 @@ #include #include -#include #include #include #include