diff --git a/ChangeLog b/ChangeLog index 384fe581..715ca1b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17184,3 +17184,6 @@ 2018-07-19 Fred Gleason * Cleaned up SQL quieries in 'web/rdfeed/' to ensure UTF-8 compatibility. +2018-07-19 Fred Gleason + * Removed the 'RDEncoder' class. + * Removed the 'RDEncoderList' class. diff --git a/lib/Makefile.am b/lib/Makefile.am index 4d714b16..079a7961 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -122,8 +122,6 @@ dist_librd_la_SOURCES = dbversion.h\ rdedit_audio.cpp rdedit_audio.h\ rdedit_panel_name.cpp rdedit_panel_name.h\ rdemptycart.cpp rdemptycart.h\ - rdencoder.cpp rdencoder.h\ - rdencoderlist.cpp rdencoderlist.h\ rdescape_string.cpp rdescape_string.h\ rdevent.cpp rdevent.h\ rdevent_line.cpp rdevent_line.h\ diff --git a/lib/lib.pro b/lib/lib.pro index 095962d0..3bff963c 100644 --- a/lib/lib.pro +++ b/lib/lib.pro @@ -64,8 +64,6 @@ SOURCES += rddbheartbeat.cpp SOURCES += rddebug.cpp SOURCES += rddropbox.cpp SOURCES += rdemptycart.cpp -SOURCES += rdencoder.cpp -SOURCES += rdencoderlist.cpp SOURCES += rdescape_string.cpp SOURCES += rdevent.cpp SOURCES += rdevent_line.cpp @@ -209,8 +207,6 @@ HEADERS += rddbheartbeat.h HEADERS += rddebug.h HEADERS += rddropbox.h HEADERS += rdemptycart.h -HEADERS += rdencoder.h -HEADERS += rdencoderlist.h HEADERS += rdescape_string.h HEADERS += rdevent.h HEADERS += rdevent_line.h diff --git a/lib/rdencoder.cpp b/lib/rdencoder.cpp deleted file mode 100644 index a137a524..00000000 --- a/lib/rdencoder.cpp +++ /dev/null @@ -1,140 +0,0 @@ -// rdencoder.cpp -// -// Abstract a Rivendell Custom Encoder -// -// (C) Copyright 2008,2016 Fred Gleason -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU 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 - -RDEncoder::RDEncoder() -{ - clear(); -} - - -QString RDEncoder::name() const -{ - return encoder_name; -} - - -void RDEncoder::setName(const QString &str) -{ - encoder_name=str; -} - - -int RDEncoder::id() const -{ - return encoder_id; -} - - -void RDEncoder::setId(int id) -{ - encoder_id=id; -} - - -QString RDEncoder::commandLine() const -{ - return encoder_command_line; -} - - -void RDEncoder::setCommandLine(const QString &str) -{ - encoder_command_line=str; -} - - -QString RDEncoder::defaultExtension() const -{ - return encoder_default_extension; -} - - -void RDEncoder::setDefaultExtension(const QString &str) -{ - encoder_default_extension=str; -} - - -int RDEncoder::allowedChannelsQuantity() const -{ - return encoder_channels.size(); -} - - -int RDEncoder::allowedChannel(unsigned n) -{ - return encoder_channels[n]; -} - - -void RDEncoder::addAllowedChannel(int val) -{ - encoder_channels.push_back(val); -} - - -int RDEncoder::allowedSampleratesQuantity() const -{ - return encoder_samplerates.size(); -} - - -int RDEncoder::allowedSamplerate(unsigned n) -{ - return encoder_samplerates[n]; -} - - -void RDEncoder::addAllowedSamplerate(int val) -{ - encoder_samplerates.push_back(val); -} - - -int RDEncoder::allowedBitratesQuantity() const -{ - return encoder_bitrates.size(); -} - - -int RDEncoder::allowedBitrate(unsigned n) -{ - return encoder_bitrates[n]; -} - - -void RDEncoder::addAllowedBitrate(int val) -{ - encoder_bitrates.push_back(val); -} - - -void RDEncoder::clear() -{ - encoder_name=""; - encoder_id=-1; - encoder_command_line=""; - encoder_default_extension=""; - encoder_channels.clear(); - encoder_samplerates.clear(); - encoder_bitrates.clear(); -} diff --git a/lib/rdencoder.h b/lib/rdencoder.h deleted file mode 100644 index 6ff33953..00000000 --- a/lib/rdencoder.h +++ /dev/null @@ -1,62 +0,0 @@ -// rdencoder.h -// -// Abstract a Rivendell Custom Encoder -// -// (C) Copyright 2008,2016 Fred Gleason -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU 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 RDENCODER_H -#define RDENCODER_H - -#include - -#include - -class RDEncoder -{ - public: - RDEncoder(); - QString name() const; - void setName(const QString &str); - int id() const; - void setId(int id); - QString commandLine() const; - void setCommandLine(const QString &str); - QString defaultExtension() const; - void setDefaultExtension(const QString &str); - int allowedChannelsQuantity() const; - int allowedChannel(unsigned n); - void addAllowedChannel(int val); - int allowedSampleratesQuantity() const; - int allowedSamplerate(unsigned n); - void addAllowedSamplerate(int val); - int allowedBitratesQuantity() const; - int allowedBitrate(unsigned n); - void addAllowedBitrate(int val); - void clear(); - - private: - QString encoder_name; - int encoder_id; - QString encoder_command_line; - QString encoder_default_extension; - std::vector encoder_channels; - std::vector encoder_samplerates; - std::vector encoder_bitrates; -}; - - -#endif // RDENCODER_H diff --git a/lib/rdencoderlist.cpp b/lib/rdencoderlist.cpp deleted file mode 100644 index 584b8db3..00000000 --- a/lib/rdencoderlist.cpp +++ /dev/null @@ -1,91 +0,0 @@ -// rdencoderlist.cpp -// -// Abstract a Rivendell Custom Encoder -// -// (C) Copyright 2008,2016 Fred Gleason -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU 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 - -RDEncoderList::RDEncoderList(const QString &stationname) -{ - QString sql; - RDSqlQuery *q; - RDSqlQuery *q1; - - sql=QString("select ")+ - "ID,"+ - "NAME,"+ - "DEFAULT_EXTENSION,"+ - "COMMAND_LINE "+ - "from ENCODERS where STATION_NAME=\""+RDEscapeString(stationname)+"\""; - q=new RDSqlQuery(sql); - while(q->next()) { - list_encoders.push_back(new RDEncoder()); - list_encoders.back()->setId(q->value(0).toInt()); - list_encoders.back()->setName(q->value(1).toString()); - list_encoders.back()->setDefaultExtension(q->value(2).toString()); - list_encoders.back()->setCommandLine(q->value(3).toString()); - sql=QString().sprintf("select CHANNELS from ENCODER_CHANNELS \ - where ENCODER_ID=%d order by CHANNELS", - q->value(0).toInt()); - q1=new RDSqlQuery(sql); - while(q1->next()) { - list_encoders.back()->addAllowedChannel(q1->value(0).toInt()); - } - delete q1; - sql=QString().sprintf("select SAMPLERATES from ENCODER_SAMPLERATES \ - where ENCODER_ID=%d order by SAMPLERATES", - q->value(0).toInt()); - q1=new RDSqlQuery(sql); - while(q1->next()) { - list_encoders.back()->addAllowedSamplerate(q1->value(0).toInt()); - } - delete q1; - sql=QString().sprintf("select BITRATES from ENCODER_BITRATES \ - where ENCODER_ID=%d order by BITRATES", - q->value(0).toInt()); - q1=new RDSqlQuery(sql); - while(q1->next()) { - list_encoders.back()->addAllowedBitrate(q1->value(0).toInt()); - } - delete q1; - } - delete q; -} - - -RDEncoderList::~RDEncoderList() -{ - for(unsigned i=0;i -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU 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 RDENCODERLIST_H -#define RDENCODERLIST_H - -#include - -#include - -#include - -class RDEncoderList -{ - public: - RDEncoderList(const QString &stationname); - ~RDEncoderList(); - unsigned encoderQuantity() const; - RDEncoder *encoder(unsigned n); - - private: - std::vector list_encoders; -}; - - -#endif // RDENCODERLIST_H diff --git a/lib/rdexport_settings_dialog.cpp b/lib/rdexport_settings_dialog.cpp index ae6504df..704a9a67 100644 --- a/lib/rdexport_settings_dialog.cpp +++ b/lib/rdexport_settings_dialog.cpp @@ -46,11 +46,6 @@ RDExportSettingsDialog::RDExportSettingsDialog(RDSettings *settings, // setCaption(tr("Edit Export Settings")); - // - // Custom Encoders - // - lib_encoders=new RDEncoderList(rda->station()->name()); - // // Default Format // @@ -158,12 +153,6 @@ RDExportSettingsDialog::RDExportSettingsDialog(RDSettings *settings, lib_format_box->setCurrentItem(lib_format_box->count()-1); } } - for(unsigned i=0;iencoderQuantity();i++) { - lib_format_box->insertItem(lib_encoders->encoder(i)->name()); - if(settings->format()==lib_encoders->encoder(i)->id()) { - lib_format_box->setCurrentItem(lib_format_box->count()-1); - } - } lib_channels_box->insertItem("1"); lib_channels_box->insertItem("2"); lib_channels_box->setCurrentItem(lib_settings->channels()-1); @@ -185,7 +174,6 @@ RDExportSettingsDialog::RDExportSettingsDialog(RDSettings *settings, RDExportSettingsDialog::~RDExportSettingsDialog() { - delete lib_encoders; delete lib_channels_box; delete lib_samprate_box; delete lib_bitrate_box; @@ -241,71 +229,40 @@ void RDExportSettingsDialog::okData() lib_settings->setChannels(lib_channels_box->currentItem()+1); lib_settings->setSampleRate(lib_samprate_box->currentText().toInt()); switch(lib_settings->format()) { - case RDSettings::Pcm16: - lib_settings->setBitRate(0); + case RDSettings::Pcm16: + case RDSettings::Pcm24: + lib_settings->setBitRate(0); + lib_settings->setQuality(0); + break; + + case RDSettings::MpegL1: + case RDSettings::MpegL2: + case RDSettings::MpegL2Wav: + case RDSettings::MpegL3: + if (lib_bitrate_box && lib_bitrate_box->currentText()){ + sscanf(lib_bitrate_box->currentText(),"%d",&rate); + } + if(rate!=0) { + lib_settings->setBitRate(1000*rate); lib_settings->setQuality(0); - break; - - case RDSettings::MpegL1: - case RDSettings::MpegL2: - case RDSettings::MpegL3: - if (lib_bitrate_box && lib_bitrate_box->currentText()){ - sscanf(lib_bitrate_box->currentText(),"%d",&rate); - } - if(rate!=0) { - lib_settings->setBitRate(1000*rate); - lib_settings->setQuality(0); - } - else { - lib_settings->setBitRate(0); - lib_quality_spin->setRange(0,9); - lib_settings->setQuality(lib_quality_spin->value()); - } - break; - - case RDSettings::Flac: + } + else { lib_settings->setBitRate(0); - lib_settings->setQuality(0); - break; - - case RDSettings::OggVorbis: - lib_settings->setBitRate(0); - lib_quality_spin->setRange(-1,10); + lib_quality_spin->setRange(0,9); lib_settings->setQuality(lib_quality_spin->value()); - break; + } + break; - default: // Custom format - for(unsigned i=0;iencoderQuantity();i++) { - if(lib_encoders->encoder(i)->id()==lib_settings->format()) { - lib_settings->setFormatName(lib_encoders->encoder(i)->name()); - lib_settings-> - setCustomCommandLine(lib_encoders->encoder(i)->commandLine()); - } - } - if(lib_channels_box->isEnabled()) { - lib_settings->setChannels(lib_channels_box->currentText().toUInt()); - } - else { - lib_settings->setChannels(0); - } - if(lib_samprate_box->isEnabled()) { - lib_settings->setSampleRate(lib_samprate_box->currentText().toUInt()); - } - else { - lib_settings->setSampleRate(0); - } - if(lib_bitrate_box->isEnabled()) { - sscanf(lib_bitrate_box->currentText(),"%d",&rate); - } - if(rate!=0) { - lib_settings->setBitRate(1000*rate); - lib_settings->setQuality(0); - } - else { - lib_settings->setBitRate(0); - } + case RDSettings::Flac: + lib_settings->setBitRate(0); + lib_settings->setQuality(0); + break; - break; + case RDSettings::OggVorbis: + lib_settings->setBitRate(0); + lib_quality_spin->setRange(-1,10); + lib_settings->setQuality(lib_quality_spin->value()); + break; } done(0); } @@ -321,570 +278,526 @@ void RDExportSettingsDialog::ShowBitRates(RDSettings::Format fmt, int new_samprate, int bitrate,int qual) { - RDEncoder *encoder; - int samprate=lib_samprate_box->currentText().toInt(); int channels=lib_channels_box->currentText().toInt(); lib_channels_box->clear(); lib_samprate_box->clear(); lib_bitrate_box->clear(); switch(fmt) { - case RDSettings::Pcm16: // PCM16 - case RDSettings::Pcm24: // PCM16 - lib_channels_box->insertItem("1"); - lib_channels_box->insertItem("2"); - lib_samprate_box->insertItem("32000"); - lib_samprate_box->insertItem("44100"); - lib_samprate_box->insertItem("48000"); - lib_bitrate_box->setDisabled(true); - lib_bitrate_label->setDisabled(true); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; + case RDSettings::Pcm16: // PCM16 + case RDSettings::Pcm24: // PCM16 + lib_channels_box->insertItem("1"); + lib_channels_box->insertItem("2"); + lib_samprate_box->insertItem("32000"); + lib_samprate_box->insertItem("44100"); + lib_samprate_box->insertItem("48000"); + lib_bitrate_box->setDisabled(true); + lib_bitrate_label->setDisabled(true); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; - case RDSettings::MpegL1: // MPEG-1 Layer 1 - lib_channels_box->insertItem("1"); - lib_channels_box->insertItem("2"); - lib_samprate_box->insertItem("16000"); - lib_samprate_box->insertItem("22050"); - lib_samprate_box->insertItem("32000"); - lib_samprate_box->insertItem("44100"); - lib_samprate_box->insertItem("48000"); - lib_bitrate_box->setEnabled(true); - lib_bitrate_label->setEnabled(true); - lib_bitrate_box->insertItem(tr("32 kbps")); - lib_bitrate_box->insertItem(tr("64 kbps")); - lib_bitrate_box->insertItem(tr("96 kbps")); - lib_bitrate_box->insertItem(tr("128 kbps")); - lib_bitrate_box->insertItem(tr("160 kbps")); - lib_bitrate_box->insertItem(tr("192 kbps")); - lib_bitrate_box->insertItem(tr("224 kbps")); - lib_bitrate_box->insertItem(tr("256 kbps")); - lib_bitrate_box->insertItem(tr("288 kbps")); - lib_bitrate_box->insertItem(tr("320 kbps")); - lib_bitrate_box->insertItem(tr("352 kbps")); - lib_bitrate_box->insertItem(tr("384 kbps")); - lib_bitrate_box->insertItem(tr("416 kbps")); - lib_bitrate_box->insertItem(tr("448 kbps")); - lib_bitrate_box->insertItem(tr("VBR")); - switch(bitrate) { - case 0: - lib_bitrate_box->setCurrentItem(14); - lib_quality_spin->setEnabled(true); - lib_quality_label->setEnabled(true); - lib_quality_spin->setValue(qual); - lib_quality_spin->setRange(0,9); - break; + case RDSettings::MpegL1: // MPEG-1 Layer 1 + lib_channels_box->insertItem("1"); + lib_channels_box->insertItem("2"); + lib_samprate_box->insertItem("16000"); + lib_samprate_box->insertItem("22050"); + lib_samprate_box->insertItem("32000"); + lib_samprate_box->insertItem("44100"); + lib_samprate_box->insertItem("48000"); + lib_bitrate_box->setEnabled(true); + lib_bitrate_label->setEnabled(true); + lib_bitrate_box->insertItem(tr("32 kbps")); + lib_bitrate_box->insertItem(tr("64 kbps")); + lib_bitrate_box->insertItem(tr("96 kbps")); + lib_bitrate_box->insertItem(tr("128 kbps")); + lib_bitrate_box->insertItem(tr("160 kbps")); + lib_bitrate_box->insertItem(tr("192 kbps")); + lib_bitrate_box->insertItem(tr("224 kbps")); + lib_bitrate_box->insertItem(tr("256 kbps")); + lib_bitrate_box->insertItem(tr("288 kbps")); + lib_bitrate_box->insertItem(tr("320 kbps")); + lib_bitrate_box->insertItem(tr("352 kbps")); + lib_bitrate_box->insertItem(tr("384 kbps")); + lib_bitrate_box->insertItem(tr("416 kbps")); + lib_bitrate_box->insertItem(tr("448 kbps")); + lib_bitrate_box->insertItem(tr("VBR")); + switch(bitrate) { + case 0: + lib_bitrate_box->setCurrentItem(14); + lib_quality_spin->setEnabled(true); + lib_quality_label->setEnabled(true); + lib_quality_spin->setValue(qual); + lib_quality_spin->setRange(0,9); + break; - case 32000: - lib_bitrate_box->setCurrentItem(0); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; + case 32000: + lib_bitrate_box->setCurrentItem(0); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; - case 64000: - lib_bitrate_box->setCurrentItem(1); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; + case 64000: + lib_bitrate_box->setCurrentItem(1); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; - case 96000: - lib_bitrate_box->setCurrentItem(2); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; + case 96000: + lib_bitrate_box->setCurrentItem(2); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; - case 128000: - lib_bitrate_box->setCurrentItem(3); - lib_quality_label->setDisabled(true); - lib_quality_spin->setDisabled(true); - break; + case 128000: + lib_bitrate_box->setCurrentItem(3); + lib_quality_label->setDisabled(true); + lib_quality_spin->setDisabled(true); + break; - case 160000: - lib_bitrate_box->setCurrentItem(4); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; + case 160000: + lib_bitrate_box->setCurrentItem(4); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; - case 192000: - lib_bitrate_box->setCurrentItem(5); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; + case 192000: + lib_bitrate_box->setCurrentItem(5); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; - case 224000: - lib_bitrate_box->setCurrentItem(6); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; + case 224000: + lib_bitrate_box->setCurrentItem(6); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; - case 256000: - lib_bitrate_box->setCurrentItem(7); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; + case 256000: + lib_bitrate_box->setCurrentItem(7); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; - case 288000: - lib_bitrate_box->setCurrentItem(8); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; + case 288000: + lib_bitrate_box->setCurrentItem(8); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; - case 320000: - lib_bitrate_box->setCurrentItem(9); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; + case 320000: + lib_bitrate_box->setCurrentItem(9); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; - case 352000: - lib_bitrate_box->setCurrentItem(10); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; + case 352000: + lib_bitrate_box->setCurrentItem(10); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; - case 384000: - lib_bitrate_box->setCurrentItem(11); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; + case 384000: + lib_bitrate_box->setCurrentItem(11); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; - case 416000: - lib_bitrate_box->setCurrentItem(12); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; + case 416000: + lib_bitrate_box->setCurrentItem(12); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; - case 448000: - lib_bitrate_box->setCurrentItem(13); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; - } - break; + case 448000: + lib_bitrate_box->setCurrentItem(13); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; + } + break; - case RDSettings::MpegL2: // MPEG-1 Layer 2 - lib_channels_box->insertItem("1"); - lib_channels_box->insertItem("2"); - lib_samprate_box->insertItem("16000"); - lib_samprate_box->insertItem("22050"); - lib_samprate_box->insertItem("32000"); - lib_samprate_box->insertItem("44100"); - lib_samprate_box->insertItem("48000"); - lib_bitrate_box->setEnabled(true); - lib_bitrate_label->setEnabled(true); - lib_bitrate_box->insertItem(tr("32 kbps")); - lib_bitrate_box->insertItem(tr("48 kbps")); - lib_bitrate_box->insertItem(tr("56 kbps")); - lib_bitrate_box->insertItem(tr("64 kbps")); - lib_bitrate_box->insertItem(tr("80 kbps")); - lib_bitrate_box->insertItem(tr("96 kbps")); - lib_bitrate_box->insertItem(tr("112 kbps")); - lib_bitrate_box->insertItem(tr("128 kbps")); - lib_bitrate_box->insertItem(tr("160 kbps")); - lib_bitrate_box->insertItem(tr("192 kbps")); - lib_bitrate_box->insertItem(tr("224 kbps")); - lib_bitrate_box->insertItem(tr("256 kbps")); - lib_bitrate_box->insertItem(tr("320 kbps")); - lib_bitrate_box->insertItem(tr("384 kbps")); - switch(bitrate) { - case 0: - lib_bitrate_box->setCurrentItem(11); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; + case RDSettings::MpegL2: // MPEG-1 Layer 2 + case RDSettings::MpegL2Wav: + lib_channels_box->insertItem("1"); + lib_channels_box->insertItem("2"); + lib_samprate_box->insertItem("16000"); + lib_samprate_box->insertItem("22050"); + lib_samprate_box->insertItem("32000"); + lib_samprate_box->insertItem("44100"); + lib_samprate_box->insertItem("48000"); + lib_bitrate_box->setEnabled(true); + lib_bitrate_label->setEnabled(true); + lib_bitrate_box->insertItem(tr("32 kbps")); + lib_bitrate_box->insertItem(tr("48 kbps")); + lib_bitrate_box->insertItem(tr("56 kbps")); + lib_bitrate_box->insertItem(tr("64 kbps")); + lib_bitrate_box->insertItem(tr("80 kbps")); + lib_bitrate_box->insertItem(tr("96 kbps")); + lib_bitrate_box->insertItem(tr("112 kbps")); + lib_bitrate_box->insertItem(tr("128 kbps")); + lib_bitrate_box->insertItem(tr("160 kbps")); + lib_bitrate_box->insertItem(tr("192 kbps")); + lib_bitrate_box->insertItem(tr("224 kbps")); + lib_bitrate_box->insertItem(tr("256 kbps")); + lib_bitrate_box->insertItem(tr("320 kbps")); + lib_bitrate_box->insertItem(tr("384 kbps")); + switch(bitrate) { + case 0: + lib_bitrate_box->setCurrentItem(11); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; - case 32000: - lib_bitrate_box->setCurrentItem(0); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; + case 32000: + lib_bitrate_box->setCurrentItem(0); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; - case 48000: - lib_bitrate_box->setCurrentItem(1); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; + case 48000: + lib_bitrate_box->setCurrentItem(1); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; - case 56000: - lib_bitrate_box->setCurrentItem(2); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; + case 56000: + lib_bitrate_box->setCurrentItem(2); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; - case 64000: - lib_bitrate_box->setCurrentItem(3); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; + case 64000: + lib_bitrate_box->setCurrentItem(3); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; - case 80000: - lib_bitrate_box->setCurrentItem(4); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; + case 80000: + lib_bitrate_box->setCurrentItem(4); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; - case 96000: - lib_bitrate_box->setCurrentItem(5); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; + case 96000: + lib_bitrate_box->setCurrentItem(5); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; - case 112000: - lib_bitrate_box->setCurrentItem(6); - lib_quality_label->setDisabled(true); - lib_quality_spin->setDisabled(true); - break; + case 112000: + lib_bitrate_box->setCurrentItem(6); + lib_quality_label->setDisabled(true); + lib_quality_spin->setDisabled(true); + break; - case 128000: - lib_bitrate_box->setCurrentItem(7); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; + case 128000: + lib_bitrate_box->setCurrentItem(7); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; - case 160000: - lib_bitrate_box->setCurrentItem(8); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; + case 160000: + lib_bitrate_box->setCurrentItem(8); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; - case 192000: - lib_bitrate_box->setCurrentItem(9); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; + case 192000: + lib_bitrate_box->setCurrentItem(9); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; - case 224000: - lib_bitrate_box->setCurrentItem(10); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; + case 224000: + lib_bitrate_box->setCurrentItem(10); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; - case 256000: - lib_bitrate_box->setCurrentItem(11); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; + case 256000: + lib_bitrate_box->setCurrentItem(11); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; - case 320000: - lib_bitrate_box->setCurrentItem(12); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; + case 320000: + lib_bitrate_box->setCurrentItem(12); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; - case 384000: - lib_bitrate_box->setCurrentItem(13); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; - } - break; + case 384000: + lib_bitrate_box->setCurrentItem(13); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; + } + break; - case RDSettings::MpegL3: // MPEG-1 Layer 3 - lib_channels_box->insertItem("1"); - lib_channels_box->insertItem("2"); - lib_samprate_box->insertItem("32000"); - lib_samprate_box->insertItem("44100"); - lib_samprate_box->insertItem("48000"); - lib_bitrate_box->setEnabled(true); - lib_bitrate_label->setEnabled(true); - switch(samprate) { - case 32000: - case 44100: - case 48000: - default: - lib_bitrate_box->insertItem(tr("32 kbps")); - lib_bitrate_box->insertItem(tr("40 kbps")); - lib_bitrate_box->insertItem(tr("48 kbps")); - lib_bitrate_box->insertItem(tr("56 kbps")); - lib_bitrate_box->insertItem(tr("64 kbps")); - lib_bitrate_box->insertItem(tr("80 kbps")); - lib_bitrate_box->insertItem(tr("96 kbps")); - lib_bitrate_box->insertItem(tr("112 kbps")); - lib_bitrate_box->insertItem(tr("128 kbps")); - lib_bitrate_box->insertItem(tr("160 kbps")); - lib_bitrate_box->insertItem(tr("192 kbps")); - lib_bitrate_box->insertItem(tr("224 kbps")); - lib_bitrate_box->insertItem(tr("256 kbps")); - lib_bitrate_box->insertItem(tr("320 kbps")); - lib_bitrate_box->insertItem(tr("VBR")); - switch(bitrate) { - case 0: - lib_bitrate_box->setCurrentItem(14); - lib_quality_spin->setEnabled(true); - lib_quality_label->setEnabled(true); - lib_quality_spin->setRange(0,9); - lib_quality_spin->setValue(qual); - break; - - case 32000: - lib_bitrate_box->setCurrentItem(0); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; - - case 40000: - lib_bitrate_box->setCurrentItem(1); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; - - case 48000: - lib_bitrate_box->setCurrentItem(2); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; - - case 56000: - lib_bitrate_box->setCurrentItem(3); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; - - case 64000: - lib_bitrate_box->setCurrentItem(4); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; - - case 80000: - lib_bitrate_box->setCurrentItem(5); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; - - case 96000: - lib_bitrate_box->setCurrentItem(6); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; - - case 112000: - lib_bitrate_box->setCurrentItem(7); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; - - case 128000: - lib_bitrate_box->setCurrentItem(8); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; - - case 160000: - lib_bitrate_box->setCurrentItem(9); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; - - case 192000: - lib_bitrate_box->setCurrentItem(10); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; - - case 224000: - lib_bitrate_box->setCurrentItem(11); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; - - case 256000: - lib_bitrate_box->setCurrentItem(12); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; - - case 320000: - lib_bitrate_box->setCurrentItem(13); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; - } - break; - - case 16000: - case 22050: - case 24000: - lib_bitrate_box->insertItem(tr("8 kbps")); - lib_bitrate_box->insertItem(tr("16 kbps")); - lib_bitrate_box->insertItem(tr("24 kbps")); - lib_bitrate_box->insertItem(tr("32 kbps")); - lib_bitrate_box->insertItem(tr("40 kbps")); - lib_bitrate_box->insertItem(tr("48 kbps")); - lib_bitrate_box->insertItem(tr("56 kbps")); - lib_bitrate_box->insertItem(tr("64 kbps")); - lib_bitrate_box->insertItem(tr("80 kbps")); - lib_bitrate_box->insertItem(tr("96 kbps")); - lib_bitrate_box->insertItem(tr("112 kbps")); - lib_bitrate_box->insertItem(tr("128 kbps")); - lib_bitrate_box->insertItem(tr("144 kbps")); - lib_bitrate_box->insertItem(tr("160 kbps")); - lib_bitrate_box->insertItem(tr("VBR")); - switch(bitrate) { - case 0: - lib_bitrate_box->setCurrentItem(14); - lib_quality_spin->setEnabled(true); - lib_quality_label->setEnabled(true); - lib_quality_spin->setRange(0,9); - lib_quality_spin->setValue(qual); - break; - - case 8000: - lib_bitrate_box->setCurrentItem(0); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; - - case 16000: - lib_bitrate_box->setCurrentItem(1); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; - - case 24000: - lib_bitrate_box->setCurrentItem(2); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; - - case 32000: - lib_bitrate_box->setCurrentItem(3); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; - - case 40000: - lib_bitrate_box->setCurrentItem(4); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; - - case 48000: - lib_bitrate_box->setCurrentItem(5); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; - - case 56000: - lib_bitrate_box->setCurrentItem(6); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; - - case 64000: - lib_bitrate_box->setCurrentItem(7); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; - - case 80000: - lib_bitrate_box->setCurrentItem(8); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; - - case 96000: - lib_bitrate_box->setCurrentItem(9); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; - - case 112000: - lib_bitrate_box->setCurrentItem(10); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; - - case 128000: - lib_bitrate_box->setCurrentItem(11); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; - - case 144000: - lib_bitrate_box->setCurrentItem(12); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; - - case 160000: - lib_bitrate_box->setCurrentItem(13); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; - } - break; - } - break; - - case RDSettings::Flac: - lib_channels_box->insertItem("1"); - lib_channels_box->insertItem("2"); - lib_samprate_box->insertItem("32000"); - lib_samprate_box->insertItem("44100"); - lib_samprate_box->insertItem("48000"); - lib_bitrate_box->setDisabled(true); - lib_bitrate_label->setDisabled(true); - lib_quality_spin->setDisabled(true); - lib_quality_label->setDisabled(true); - break; - - case RDSettings::OggVorbis: - lib_channels_box->insertItem("1"); - lib_channels_box->insertItem("2"); - lib_samprate_box->insertItem("32000"); - lib_samprate_box->insertItem("44100"); - lib_samprate_box->insertItem("48000"); - lib_bitrate_box->setDisabled(true); - lib_bitrate_label->setDisabled(true); + case RDSettings::MpegL3: // MPEG-1 Layer 3 + lib_channels_box->insertItem("1"); + lib_channels_box->insertItem("2"); + lib_samprate_box->insertItem("32000"); + lib_samprate_box->insertItem("44100"); + lib_samprate_box->insertItem("48000"); + lib_bitrate_box->setEnabled(true); + lib_bitrate_label->setEnabled(true); + switch(samprate) { + case 32000: + case 44100: + case 48000: + default: + lib_bitrate_box->insertItem(tr("32 kbps")); + lib_bitrate_box->insertItem(tr("40 kbps")); + lib_bitrate_box->insertItem(tr("48 kbps")); + lib_bitrate_box->insertItem(tr("56 kbps")); + lib_bitrate_box->insertItem(tr("64 kbps")); + lib_bitrate_box->insertItem(tr("80 kbps")); + lib_bitrate_box->insertItem(tr("96 kbps")); + lib_bitrate_box->insertItem(tr("112 kbps")); + lib_bitrate_box->insertItem(tr("128 kbps")); + lib_bitrate_box->insertItem(tr("160 kbps")); + lib_bitrate_box->insertItem(tr("192 kbps")); + lib_bitrate_box->insertItem(tr("224 kbps")); + lib_bitrate_box->insertItem(tr("256 kbps")); + lib_bitrate_box->insertItem(tr("320 kbps")); + lib_bitrate_box->insertItem(tr("VBR")); + switch(bitrate) { + case 0: + lib_bitrate_box->setCurrentItem(14); lib_quality_spin->setEnabled(true); lib_quality_label->setEnabled(true); - lib_quality_spin->setRange(-1,10); + lib_quality_spin->setRange(0,9); lib_quality_spin->setValue(qual); break; - - default: // Custom format - lib_channels_box->clear(); - lib_samprate_box->clear(); - lib_bitrate_box->clear(); - for(unsigned i=0;iencoderQuantity();i++) { - encoder=lib_encoders->encoder(i); - if(encoder->id()==fmt) { - if(encoder->allowedChannelsQuantity()==0) { - lib_channels_box->setDisabled(true); - } - else { - lib_channels_box->setEnabled(true); - for(int j=0;jallowedChannelsQuantity();j++) { - lib_channels_box-> - insertItem(QString().sprintf("%d",encoder->allowedChannel(j))); - } - } - if(encoder->allowedSampleratesQuantity()==0) { - lib_samprate_box->setDisabled(true); - } - else { - lib_samprate_box->setEnabled(true); - for(int j=0;jallowedSampleratesQuantity();j++) { - lib_samprate_box-> - insertItem(QString().sprintf("%d", - encoder->allowedSamplerate(j))); - } - } - if(encoder->allowedBitratesQuantity()==0) { - lib_bitrate_box->setDisabled(true); - } - else { - lib_bitrate_box->setEnabled(true); - for(int j=0;jallowedBitratesQuantity();j++) { - lib_bitrate_box-> - insertItem(QString().sprintf("%d kbps", - encoder->allowedBitrate(j))); - } - } - } + + case 32000: + lib_bitrate_box->setCurrentItem(0); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; + + case 40000: + lib_bitrate_box->setCurrentItem(1); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; + + case 48000: + lib_bitrate_box->setCurrentItem(2); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; + + case 56000: + lib_bitrate_box->setCurrentItem(3); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; + + case 64000: + lib_bitrate_box->setCurrentItem(4); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; + + case 80000: + lib_bitrate_box->setCurrentItem(5); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; + + case 96000: + lib_bitrate_box->setCurrentItem(6); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; + + case 112000: + lib_bitrate_box->setCurrentItem(7); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; + + case 128000: + lib_bitrate_box->setCurrentItem(8); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; + + case 160000: + lib_bitrate_box->setCurrentItem(9); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; + + case 192000: + lib_bitrate_box->setCurrentItem(10); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; + + case 224000: + lib_bitrate_box->setCurrentItem(11); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; + + case 256000: + lib_bitrate_box->setCurrentItem(12); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; + + case 320000: + lib_bitrate_box->setCurrentItem(13); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; } break; + + case 16000: + case 22050: + case 24000: + lib_bitrate_box->insertItem(tr("8 kbps")); + lib_bitrate_box->insertItem(tr("16 kbps")); + lib_bitrate_box->insertItem(tr("24 kbps")); + lib_bitrate_box->insertItem(tr("32 kbps")); + lib_bitrate_box->insertItem(tr("40 kbps")); + lib_bitrate_box->insertItem(tr("48 kbps")); + lib_bitrate_box->insertItem(tr("56 kbps")); + lib_bitrate_box->insertItem(tr("64 kbps")); + lib_bitrate_box->insertItem(tr("80 kbps")); + lib_bitrate_box->insertItem(tr("96 kbps")); + lib_bitrate_box->insertItem(tr("112 kbps")); + lib_bitrate_box->insertItem(tr("128 kbps")); + lib_bitrate_box->insertItem(tr("144 kbps")); + lib_bitrate_box->insertItem(tr("160 kbps")); + lib_bitrate_box->insertItem(tr("VBR")); + switch(bitrate) { + case 0: + lib_bitrate_box->setCurrentItem(14); + lib_quality_spin->setEnabled(true); + lib_quality_label->setEnabled(true); + lib_quality_spin->setRange(0,9); + lib_quality_spin->setValue(qual); + break; + + case 8000: + lib_bitrate_box->setCurrentItem(0); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; + + case 16000: + lib_bitrate_box->setCurrentItem(1); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; + + case 24000: + lib_bitrate_box->setCurrentItem(2); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; + + case 32000: + lib_bitrate_box->setCurrentItem(3); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; + + case 40000: + lib_bitrate_box->setCurrentItem(4); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; + + case 48000: + lib_bitrate_box->setCurrentItem(5); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; + + case 56000: + lib_bitrate_box->setCurrentItem(6); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; + + case 64000: + lib_bitrate_box->setCurrentItem(7); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; + + case 80000: + lib_bitrate_box->setCurrentItem(8); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; + + case 96000: + lib_bitrate_box->setCurrentItem(9); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; + + case 112000: + lib_bitrate_box->setCurrentItem(10); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; + + case 128000: + lib_bitrate_box->setCurrentItem(11); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; + + case 144000: + lib_bitrate_box->setCurrentItem(12); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; + + case 160000: + lib_bitrate_box->setCurrentItem(13); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; + } + break; + } + break; + + case RDSettings::Flac: + lib_channels_box->insertItem("1"); + lib_channels_box->insertItem("2"); + lib_samprate_box->insertItem("32000"); + lib_samprate_box->insertItem("44100"); + lib_samprate_box->insertItem("48000"); + lib_bitrate_box->setDisabled(true); + lib_bitrate_label->setDisabled(true); + lib_quality_spin->setDisabled(true); + lib_quality_label->setDisabled(true); + break; + + case RDSettings::OggVorbis: + lib_channels_box->insertItem("1"); + lib_channels_box->insertItem("2"); + lib_samprate_box->insertItem("32000"); + lib_samprate_box->insertItem("44100"); + lib_samprate_box->insertItem("48000"); + lib_bitrate_box->setDisabled(true); + lib_bitrate_label->setDisabled(true); + lib_quality_spin->setEnabled(true); + lib_quality_label->setEnabled(true); + lib_quality_spin->setRange(-1,10); + lib_quality_spin->setValue(qual); + break; } SetCurrentItem(lib_channels_box,channels); SetCurrentItem(lib_samprate_box,samprate); @@ -921,11 +834,6 @@ RDSettings::Format RDExportSettingsDialog::GetFormat(QString str) if(str==tr("OggVorbis")) { return RDSettings::OggVorbis; } - for(unsigned i=0;iencoderQuantity();i++) { - if(str==lib_encoders->encoder(i)->name()) { - return (RDSettings::Format)lib_encoders->encoder(i)->id(); - } - } return RDSettings::Pcm16; } diff --git a/lib/rdexport_settings_dialog.h b/lib/rdexport_settings_dialog.h index 86c2231b..f2cec1d8 100644 --- a/lib/rdexport_settings_dialog.h +++ b/lib/rdexport_settings_dialog.h @@ -28,7 +28,6 @@ #include #include -#include class RDExportSettingsDialog : public QDialog { @@ -50,7 +49,6 @@ class RDExportSettingsDialog : public QDialog void ShowBitRates(RDSettings::Format fmt,int samprate,int bitrate,int qual); void SetCurrentItem(QComboBox *box,int value); RDSettings::Format GetFormat(QString str); - RDEncoderList *lib_encoders; RDSettings *lib_settings; QComboBox *lib_format_box; QComboBox *lib_channels_box; diff --git a/rdadmin/view_adapters.cpp b/rdadmin/view_adapters.cpp index f8a81d39..2583a1f6 100644 --- a/rdadmin/view_adapters.cpp +++ b/rdadmin/view_adapters.cpp @@ -23,10 +23,8 @@ #include #include -#include - -#include +#include "view_adapters.h" ViewAdapters::ViewAdapters(RDStation *rdstation,QWidget *parent) : QDialog(parent,"",true) @@ -112,11 +110,6 @@ ViewAdapters::ViewAdapters(RDStation *rdstation,QWidget *parent) } text+=tr(" PCM16 Linear\n"); text+=tr(" PCM24 Linear\n"); - RDEncoderList *encoders=new RDEncoderList(rdstation->name()); - for(unsigned i=0;iencoderQuantity();i++) { - text+=" "+encoders->encoder(i)->name()+" [Custom]\n"; - } - delete encoders; text+="\n";