mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-10-12 09:33:37 +02:00
2020-10-15 Fred Gleason <fredg@paravelsystems.com>
* Removed the 'RDSettings::defaultExtension()' method containing the 'stationname' parameter. * Removed the 'stationname' parameter from the 'RDSettings::pathName()' method. * Removed the 'RDSettings::bytesPerSec()' method. Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
@@ -424,8 +424,7 @@ void RDImportAudio::selectOutputFileData()
|
||||
{
|
||||
QString filename;
|
||||
QString filter=import_settings->formatName()+" (*."+
|
||||
RDSettings::defaultExtension(rda->station()->name(),
|
||||
import_settings->format())+")";
|
||||
RDSettings::defaultExtension(import_settings->format())+")";
|
||||
|
||||
if(import_out_filename_edit->text().isEmpty()) {
|
||||
filename=QFileDialog::getSaveFileName(this,import_caption+" - "+
|
||||
@@ -441,8 +440,7 @@ void RDImportAudio::selectOutputFileData()
|
||||
}
|
||||
if(!filename.isEmpty()) {
|
||||
import_out_filename_edit->
|
||||
setText(RDSettings::pathName(rda->station()->name(),filename,
|
||||
import_settings->format()));
|
||||
setText(RDSettings::pathName(filename,import_settings->format()));
|
||||
*import_path=RDGetPathPart(import_out_filename_edit->text());
|
||||
}
|
||||
}
|
||||
@@ -456,8 +454,7 @@ void RDImportAudio::selectOutputFormatData()
|
||||
delete dialog;
|
||||
import_format_edit->setText(import_settings->description());
|
||||
import_out_filename_edit->
|
||||
setText(RDSettings::pathName(rda->station()->name(),
|
||||
import_out_filename_edit->text(),
|
||||
setText(RDSettings::pathName(import_out_filename_edit->text(),
|
||||
import_settings->format()));
|
||||
}
|
||||
|
||||
|
@@ -291,20 +291,18 @@ bool RDSettings::deletePreset(unsigned id) const
|
||||
}
|
||||
|
||||
|
||||
QString RDSettings::pathName(const QString &stationname,QString pathname,
|
||||
RDSettings::Format fmt)
|
||||
QString RDSettings::pathName(QString pathname,RDSettings::Format fmt)
|
||||
{
|
||||
QString ext;
|
||||
int index=pathname.findRev(".");
|
||||
if(index<0) {
|
||||
return pathname+"."+defaultExtension(stationname,fmt);
|
||||
return pathname+"."+defaultExtension(fmt);
|
||||
}
|
||||
ext=pathname.right(pathname.length()-index);
|
||||
if(ext.lower()==defaultExtension(stationname,fmt)) {
|
||||
if(ext.lower()==defaultExtension(fmt)) {
|
||||
return pathname;
|
||||
}
|
||||
return pathname.replace(index,ext.length(),"."+
|
||||
defaultExtension(stationname,fmt));
|
||||
return pathname.replace(index,ext.length(),"."+defaultExtension(fmt));
|
||||
}
|
||||
|
||||
|
||||
@@ -343,63 +341,6 @@ QString RDSettings::defaultExtension(RDSettings::Format fmt)
|
||||
}
|
||||
|
||||
|
||||
QString RDSettings::defaultExtension(const QString &stationname,
|
||||
RDSettings::Format fmt)
|
||||
{
|
||||
switch(fmt) {
|
||||
case RDSettings::Pcm16:
|
||||
case RDSettings::Pcm24:
|
||||
case RDSettings::MpegL2Wav:
|
||||
return QString("wav");
|
||||
|
||||
case RDSettings::MpegL1:
|
||||
return QString("mp1");
|
||||
|
||||
case RDSettings::MpegL2:
|
||||
return QString("mp2");
|
||||
|
||||
case RDSettings::MpegL3:
|
||||
return QString("mp3");
|
||||
|
||||
case RDSettings::Flac:
|
||||
return QString("flac");
|
||||
|
||||
case RDSettings::OggVorbis:
|
||||
return QString("ogg");
|
||||
}
|
||||
|
||||
return QString("dat");
|
||||
}
|
||||
|
||||
|
||||
unsigned RDSettings::bytesPerSec(const QString &stationname,
|
||||
RDSettings::Format fmt,unsigned quality)
|
||||
{
|
||||
//
|
||||
// Guesstimate the bit rate for a VBR encoding. This is *not* exact,
|
||||
// but is intended merely to provide a half-way sane value for use with
|
||||
// progress bars and such.
|
||||
//
|
||||
switch(fmt) {
|
||||
case RDSettings::MpegL3:
|
||||
return 16000;
|
||||
break;
|
||||
|
||||
case RDSettings::OggVorbis:
|
||||
return 4173*quality+7977;
|
||||
break;
|
||||
|
||||
case RDSettings::Flac:
|
||||
return 72500;
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
QString RDSettings::dump() const
|
||||
{
|
||||
QString ret;
|
||||
|
@@ -54,13 +54,8 @@ class RDSettings
|
||||
unsigned addPreset();
|
||||
bool savePreset(unsigned id) const;
|
||||
bool deletePreset(unsigned id) const;
|
||||
static QString pathName(const QString &stationname,QString pathname,
|
||||
RDSettings::Format fmt);
|
||||
static QString pathName(QString pathname,RDSettings::Format fmt);
|
||||
static QString defaultExtension(RDSettings::Format fmt);
|
||||
static QString defaultExtension(const QString &stationname,
|
||||
RDSettings::Format fmt);
|
||||
static unsigned bytesPerSec(const QString &stationname,
|
||||
RDSettings::Format fmt,unsigned quality);
|
||||
QString dump() const;
|
||||
void clear();
|
||||
|
||||
|
Reference in New Issue
Block a user