mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-05-24 16:41:40 +02:00
2015-08-30 Fred Gleason <fredg@paravelsystems.com>
* Added PCM24 to 'lib/export_settings_dialog.cpp'.
This commit is contained in:
Fred Gleason
parent
8d70a79387
commit
398408476c
@ -14834,7 +14834,7 @@
|
||||
* Removed instrumentation code in 'rdairplay/rlmhost.cpp'.
|
||||
2015-08-29 Fred Gleason <fredg@paravelsystems.com>
|
||||
* Incremented the package version to 2.10.3caefix06.
|
||||
2015-08-29 Fred Gleason <fredg@paravelsystems.com>
|
||||
2015-08-30 Fred Gleason <fredg@paravelsystems.com>
|
||||
* Added an 'RDAudioConvert::Stage3Pcm24()' method in
|
||||
'lib/rdaudioconvert.cpp' and 'lib/rdaudioconvert.h'.
|
||||
* Added a 'Format::Pcm24' value to the 'RDSettings::Format'
|
||||
@ -14855,3 +14855,5 @@
|
||||
'web/rdxport/import.cpp'.
|
||||
* Added an 'RDCae::Pcm24' value to the 'RDCae::AudioCoding
|
||||
enumeration in 'lib/rdcae.h'.
|
||||
2015-08-30 Fred Gleason <fredg@paravelsystems.com>
|
||||
* Added PCM24 to 'lib/export_settings_dialog.cpp'.
|
||||
|
||||
@ -1450,6 +1450,10 @@ Přepsat?</translation>
|
||||
<source>144 kbps</source>
|
||||
<translation>144 kb/s</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>PCM24</source>
|
||||
<translation type="unfinished">PCM24</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>RDGetAth</name>
|
||||
|
||||
@ -1441,6 +1441,10 @@ Overwrite?</source>
|
||||
<source>144 kbps</source>
|
||||
<translation>144 kbps</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>PCM24</source>
|
||||
<translation type="unfinished">PCM24</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>RDGetAth</name>
|
||||
|
||||
@ -1447,6 +1447,10 @@ Overwrite?</source>
|
||||
<source>144 kbps</source>
|
||||
<translation></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>PCM24</source>
|
||||
<translation type="unfinished">PCM24</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>RDGetAth</name>
|
||||
|
||||
@ -1369,6 +1369,10 @@ Overwrite?</source>
|
||||
<source>144 kbps</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>PCM24</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>RDGetAth</name>
|
||||
|
||||
@ -1443,6 +1443,10 @@ Skriv over?</translation>
|
||||
<source>144 kbps</source>
|
||||
<translation>144 kbps</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>PCM24</source>
|
||||
<translation type="unfinished">PCM24</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>RDGetAth</name>
|
||||
|
||||
@ -1443,6 +1443,10 @@ Skriv over?</translation>
|
||||
<source>144 kbps</source>
|
||||
<translation>144 kbps</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>PCM24</source>
|
||||
<translation type="unfinished">PCM24</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>RDGetAth</name>
|
||||
|
||||
@ -1445,6 +1445,10 @@ Sobreescrever?</translation>
|
||||
<source>144 kbps</source>
|
||||
<translation>144 kbps</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>PCM24</source>
|
||||
<translation type="unfinished">PCM24</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>RDGetAth</name>
|
||||
|
||||
@ -2,9 +2,7 @@
|
||||
//
|
||||
// Edit RDLibrary Settings
|
||||
//
|
||||
// (C) Copyright 2002 Fred Gleason <fredg@paravelsystems.com>
|
||||
//
|
||||
// $Id: rdexport_settings_dialog.cpp,v 1.12.8.1 2012/12/13 22:33:44 cvs Exp $
|
||||
// (C) Copyright 2002-2015 Fred Gleason <fredg@paravelsystems.com>
|
||||
//
|
||||
// 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
|
||||
@ -36,9 +34,8 @@
|
||||
|
||||
RDExportSettingsDialog::RDExportSettingsDialog(RDSettings *settings,
|
||||
RDStation *station,
|
||||
QWidget *parent,
|
||||
const char *name)
|
||||
: QDialog(parent,name,true)
|
||||
QWidget *parent)
|
||||
: QDialog(parent,"",true)
|
||||
{
|
||||
lib_settings=settings;
|
||||
lib_station=station;
|
||||
@ -62,66 +59,61 @@ RDExportSettingsDialog::RDExportSettingsDialog(RDSettings *settings,
|
||||
//
|
||||
// Default Format
|
||||
//
|
||||
lib_format_box=new QComboBox(this,"lib_format_box");
|
||||
lib_format_box=new QComboBox(this);
|
||||
lib_format_box->setGeometry(100,10,150,19);
|
||||
connect(lib_format_box,SIGNAL(activated(const QString &)),
|
||||
this,SLOT(formatData(const QString &)));
|
||||
QLabel *lib_format_label=new QLabel(lib_format_box,"Format:",this,
|
||||
"lib_format_label");
|
||||
QLabel *lib_format_label=new QLabel(lib_format_box,"Format:",this);
|
||||
lib_format_label->setGeometry(25,10,70,19);
|
||||
lib_format_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix);
|
||||
|
||||
//
|
||||
// Default Channels
|
||||
//
|
||||
lib_channels_box=new QComboBox(this,"lib_channels_box");
|
||||
lib_channels_box=new QComboBox(this);
|
||||
lib_channels_box->setGeometry(100,32,60,19);
|
||||
QLabel *lib_channels_label=
|
||||
new QLabel(lib_channels_box,tr("&Channels:"),this,
|
||||
"lib_channels_label");
|
||||
new QLabel(lib_channels_box,tr("&Channels:"),this);
|
||||
lib_channels_label->setGeometry(25,32,70,19);
|
||||
lib_channels_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix);
|
||||
|
||||
//
|
||||
// Default Sample Rate
|
||||
//
|
||||
lib_samprate_box=new QComboBox(this,"lib_samprate_box");
|
||||
lib_samprate_box=new QComboBox(this);
|
||||
lib_samprate_box->setGeometry(100,54,100,19);
|
||||
connect(lib_samprate_box,SIGNAL(activated(const QString &)),
|
||||
this,SLOT(samprateData(const QString &)));
|
||||
QLabel *lib_samprate_label=
|
||||
new QLabel(lib_samprate_box,tr("&Sample Rate:"),this,
|
||||
"lib_samprate_label");
|
||||
new QLabel(lib_samprate_box,tr("&Sample Rate:"),this);
|
||||
lib_samprate_label->setGeometry(25,54,75,19);
|
||||
lib_samprate_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix);
|
||||
|
||||
//
|
||||
// Default Bitrate
|
||||
//
|
||||
lib_bitrate_box=new QComboBox(this,"lib_bitrate_box");
|
||||
lib_bitrate_box=new QComboBox(this);
|
||||
lib_bitrate_box->setGeometry(100,76,100,19);
|
||||
connect(lib_bitrate_box,SIGNAL(activated(const QString &)),
|
||||
this,SLOT(bitrateData(const QString &)));
|
||||
lib_bitrate_label=new QLabel(lib_bitrate_box,tr("&Bitrate:"),this,
|
||||
"lib_bitrate_label");
|
||||
lib_bitrate_label=new QLabel(lib_bitrate_box,tr("&Bitrate:"),this);
|
||||
lib_bitrate_label->setGeometry(25,76,70,19);
|
||||
lib_bitrate_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix);
|
||||
|
||||
//
|
||||
// Quality
|
||||
//
|
||||
lib_quality_spin=new QSpinBox(this,"lib_quality_box");
|
||||
lib_quality_spin=new QSpinBox(this);
|
||||
lib_quality_spin->setGeometry(100,98,50,19);
|
||||
lib_quality_spin->setRange(0,10);
|
||||
lib_quality_label=new QLabel(lib_quality_spin,tr("&Quality:"),this,
|
||||
"lib_quality_label");
|
||||
lib_quality_label=new QLabel(lib_quality_spin,tr("&Quality:"),this);
|
||||
lib_quality_label->setGeometry(25,98,70,19);
|
||||
lib_quality_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix);
|
||||
|
||||
//
|
||||
// Ok Button
|
||||
//
|
||||
QPushButton *ok_button=new QPushButton(this,"ok_button");
|
||||
QPushButton *ok_button=new QPushButton(this);
|
||||
ok_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50);
|
||||
ok_button->setDefault(true);
|
||||
ok_button->setFont(button_font);
|
||||
@ -131,7 +123,7 @@ RDExportSettingsDialog::RDExportSettingsDialog(RDSettings *settings,
|
||||
//
|
||||
// Cancel Button
|
||||
//
|
||||
QPushButton *cancel_button=new QPushButton(this,"cancel_button");
|
||||
QPushButton *cancel_button=new QPushButton(this);
|
||||
cancel_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,
|
||||
80,50);
|
||||
cancel_button->setFont(button_font);
|
||||
@ -145,6 +137,10 @@ RDExportSettingsDialog::RDExportSettingsDialog(RDSettings *settings,
|
||||
if(settings->format()==RDSettings::Pcm16) {
|
||||
lib_format_box->setCurrentItem(lib_format_box->count()-1);
|
||||
}
|
||||
lib_format_box->insertItem(tr("PCM24"));
|
||||
if(settings->format()==RDSettings::Pcm24) {
|
||||
lib_format_box->setCurrentItem(lib_format_box->count()-1);
|
||||
}
|
||||
if(station->haveCapability(RDStation::HaveFlac)) {
|
||||
lib_format_box->insertItem(tr("FLAC"));
|
||||
if(settings->format()==RDSettings::Flac) {
|
||||
@ -339,6 +335,7 @@ void RDExportSettingsDialog::ShowBitRates(RDSettings::Format fmt,
|
||||
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");
|
||||
@ -914,6 +911,9 @@ RDSettings::Format RDExportSettingsDialog::GetFormat(QString str)
|
||||
if(str==tr("PCM16")) {
|
||||
return RDSettings::Pcm16;
|
||||
}
|
||||
if(str==tr("PCM24")) {
|
||||
return RDSettings::Pcm24;
|
||||
}
|
||||
if(str==tr("FLAC")) {
|
||||
return RDSettings::Flac;
|
||||
}
|
||||
|
||||
@ -2,9 +2,7 @@
|
||||
//
|
||||
// Edit Rivendell Audio Settings
|
||||
//
|
||||
// (C) Copyright 2002-2005 Fred Gleason <fredg@paravelsystems.com>
|
||||
//
|
||||
// $Id: rdexport_settings_dialog.h,v 1.8 2010/07/29 19:32:33 cvs Exp $
|
||||
// (C) Copyright 2002-2015 Fred Gleason <fredg@paravelsystems.com>
|
||||
//
|
||||
// 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
|
||||
@ -39,7 +37,7 @@ class RDExportSettingsDialog : public QDialog
|
||||
Q_OBJECT
|
||||
public:
|
||||
RDExportSettingsDialog(RDSettings *settings,RDStation *station,
|
||||
QWidget *parent=0,const char *name=0);
|
||||
QWidget *parent=0);
|
||||
~RDExportSettingsDialog();
|
||||
QSize sizeHint() const;
|
||||
QSizePolicy sizePolicy() const;
|
||||
|
||||
@ -2,9 +2,7 @@
|
||||
//
|
||||
// Audio File Importation Dialog for Rivendell.
|
||||
//
|
||||
// (C) Copyright 2002-2004,2010 Fred Gleason <fredg@paravelsystems.com>
|
||||
//
|
||||
// $Id: rdimport_audio.cpp,v 1.27.4.3 2013/11/13 23:36:33 cvs Exp $
|
||||
// (C) Copyright 2002-2015 Fred Gleason <fredg@paravelsystems.com>
|
||||
//
|
||||
// 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
|
||||
@ -49,8 +47,8 @@ RDImportAudio::RDImportAudio(QString cutname,QString *path,
|
||||
RDWaveData *wavedata,RDCut *clipboard,
|
||||
RDStation *station,RDUser *user,
|
||||
bool *running,RDConfig *config,
|
||||
QWidget *parent,const char *name)
|
||||
: QDialog(parent,name)
|
||||
QWidget *parent)
|
||||
: QDialog(parent)
|
||||
{
|
||||
import_config=config;
|
||||
import_default_settings=settings;
|
||||
@ -90,7 +88,7 @@ RDImportAudio::RDImportAudio(QString cutname,QString *path,
|
||||
//
|
||||
// Mode Group
|
||||
//
|
||||
import_mode_group=new QButtonGroup(this,"import_mode_group");
|
||||
import_mode_group=new QButtonGroup(this);
|
||||
import_mode_group->hide();
|
||||
connect(import_mode_group,SIGNAL(clicked(int)),
|
||||
this,SLOT(modeClickedData(int)));
|
||||
@ -98,7 +96,7 @@ RDImportAudio::RDImportAudio(QString cutname,QString *path,
|
||||
//
|
||||
// Input Mode Button
|
||||
//
|
||||
import_importmode_button=new QRadioButton(tr("Import File"), this,"import_importmode_button");
|
||||
import_importmode_button=new QRadioButton(tr("Import File"), this);
|
||||
import_mode_group->insert(import_importmode_button);
|
||||
import_importmode_button->setGeometry(10,10,sizeHint().width()-40,15);
|
||||
import_importmode_button->setFont(mode_font);
|
||||
@ -107,13 +105,12 @@ RDImportAudio::RDImportAudio(QString cutname,QString *path,
|
||||
//
|
||||
// Input Filename
|
||||
//
|
||||
import_in_filename_edit=new QLineEdit(this,"import_in_filename_edit");
|
||||
import_in_filename_edit=new QLineEdit(this);
|
||||
import_in_filename_edit->setGeometry(85,30,sizeHint().width()-180,20);
|
||||
connect(import_in_filename_edit,SIGNAL(textChanged(const QString &)),
|
||||
this,SLOT(filenameChangedData(const QString &)));
|
||||
import_in_filename_label=
|
||||
new QLabel(import_in_filename_edit,tr("Filename:"),
|
||||
this,"import_in_filename_label");
|
||||
new QLabel(import_in_filename_edit,tr("Filename:"),this);
|
||||
import_in_filename_label->setGeometry(10,30,70,20);
|
||||
import_in_filename_label->setFont(label_font);
|
||||
import_in_filename_label->setAlignment(AlignVCenter|AlignRight);
|
||||
@ -121,8 +118,7 @@ RDImportAudio::RDImportAudio(QString cutname,QString *path,
|
||||
//
|
||||
// Input File Selector Button
|
||||
//
|
||||
import_in_selector_button=
|
||||
new QPushButton(tr("&Select"),this,"import_in_selector_button");
|
||||
import_in_selector_button=new QPushButton(tr("&Select"),this);
|
||||
import_in_selector_button->setGeometry(sizeHint().width()-85,27,70,26);
|
||||
connect(import_in_selector_button,SIGNAL(clicked()),
|
||||
this,SLOT(selectInputFileData()));
|
||||
@ -130,7 +126,7 @@ RDImportAudio::RDImportAudio(QString cutname,QString *path,
|
||||
//
|
||||
// Input Metadata
|
||||
//
|
||||
import_in_metadata_box=new QCheckBox(tr("Import file metadata"),this,"import_in_metadata_box");
|
||||
import_in_metadata_box=new QCheckBox(tr("Import file metadata"),this);
|
||||
import_in_metadata_box->setGeometry(95,56,160,15);
|
||||
import_in_metadata_box->setChecked(*import_import_metadata);
|
||||
import_in_metadata_box->setFont(label_font);
|
||||
@ -138,11 +134,10 @@ RDImportAudio::RDImportAudio(QString cutname,QString *path,
|
||||
//
|
||||
// Input Channels
|
||||
//
|
||||
import_channels_box=new QComboBox(this,"import_channels_box");
|
||||
import_channels_box=new QComboBox(this);
|
||||
import_channels_box->setGeometry(310,54,50,20);
|
||||
import_channels_label=
|
||||
new QLabel(import_channels_box,tr("Channels:"),
|
||||
this,"import_channels_label");
|
||||
new QLabel(import_channels_box,tr("Channels:"),this);
|
||||
import_channels_label->setGeometry(230,54,75,20);
|
||||
import_channels_label->setFont(label_font);
|
||||
import_channels_label->setAlignment(AlignRight|AlignVCenter);
|
||||
@ -150,7 +145,7 @@ RDImportAudio::RDImportAudio(QString cutname,QString *path,
|
||||
//
|
||||
// Autotrim Check Box
|
||||
//
|
||||
import_autotrim_box=new QCheckBox(tr("Autotrim"),this,"import_autotrim_box");
|
||||
import_autotrim_box=new QCheckBox(tr("Autotrim"),this);
|
||||
import_autotrim_box->setGeometry(95,82,80,15);
|
||||
import_autotrim_box->setChecked(true);
|
||||
import_autotrim_box->setFont(label_font);
|
||||
@ -160,15 +155,14 @@ RDImportAudio::RDImportAudio(QString cutname,QString *path,
|
||||
//
|
||||
// Autotrim Level
|
||||
//
|
||||
import_autotrim_spin=new QSpinBox(this,"import_autotrim_spin");
|
||||
import_autotrim_spin=new QSpinBox(this);
|
||||
import_autotrim_spin->setGeometry(235,80,40,20);
|
||||
import_autotrim_spin->setRange(-99,0);
|
||||
import_autotrim_label=new QLabel(import_autotrim_spin,tr("Level:"),
|
||||
this,"autotrim_spin_label");
|
||||
import_autotrim_label=new QLabel(import_autotrim_spin,tr("Level:"),this);
|
||||
import_autotrim_label->setGeometry(185,80,45,20);
|
||||
import_autotrim_label->setFont(label_font);
|
||||
import_autotrim_label->setAlignment(AlignRight|AlignVCenter);
|
||||
import_autotrim_unit=new QLabel(tr("dBFS"),this,"autotrim_unit_label");
|
||||
import_autotrim_unit=new QLabel(tr("dBFS"),this);
|
||||
import_autotrim_unit->setGeometry(280,80,40,20);
|
||||
import_autotrim_unit->setFont(label_font);
|
||||
import_autotrim_unit->setAlignment(AlignLeft|AlignVCenter);
|
||||
@ -176,7 +170,7 @@ RDImportAudio::RDImportAudio(QString cutname,QString *path,
|
||||
//
|
||||
// Output Mode Button
|
||||
//
|
||||
import_exportmode_button=new QRadioButton(tr("Export File"),this,"import_exportmode_button");
|
||||
import_exportmode_button=new QRadioButton(tr("Export File"),this);
|
||||
import_mode_group->insert(import_exportmode_button);
|
||||
import_exportmode_button->setGeometry(10,120,sizeHint().width()-40,15);
|
||||
import_exportmode_button->setFont(mode_font);
|
||||
@ -184,14 +178,13 @@ RDImportAudio::RDImportAudio(QString cutname,QString *path,
|
||||
//
|
||||
// Output Filename
|
||||
//
|
||||
import_out_filename_edit=new QLineEdit(this,"import_out_filename_edit");
|
||||
import_out_filename_edit=new QLineEdit(this);
|
||||
import_out_filename_edit->setGeometry(85,140,sizeHint().width()-180,20);
|
||||
connect(import_out_filename_edit,SIGNAL(textChanged(const QString &)),
|
||||
this,SLOT(filenameChangedData(const QString &)));
|
||||
import_out_filename_edit->setReadOnly(true);
|
||||
import_out_filename_label=
|
||||
new QLabel(import_out_filename_edit,tr("Filename:"),
|
||||
this,"import_out_filename_label");
|
||||
new QLabel(import_out_filename_edit,tr("Filename:"),this);
|
||||
import_out_filename_label->setGeometry(10,140,70,20);
|
||||
import_out_filename_label->setFont(label_font);
|
||||
import_out_filename_label->setAlignment(AlignVCenter|AlignRight);
|
||||
@ -199,8 +192,7 @@ RDImportAudio::RDImportAudio(QString cutname,QString *path,
|
||||
//
|
||||
// Output File Selector Button
|
||||
//
|
||||
import_out_selector_button=
|
||||
new QPushButton(tr("&Select"),this,"import_out_selector_button");
|
||||
import_out_selector_button=new QPushButton(tr("&Select"),this);
|
||||
import_out_selector_button->setGeometry(sizeHint().width()-85,137,70,26);
|
||||
connect(import_out_selector_button,SIGNAL(clicked()),
|
||||
this,SLOT(selectOutputFileData()));
|
||||
@ -208,7 +200,7 @@ RDImportAudio::RDImportAudio(QString cutname,QString *path,
|
||||
//
|
||||
// Output Metadata
|
||||
//
|
||||
import_out_metadata_box=new QCheckBox(tr("Export file metadata"),this,"import_out_metadata_box");
|
||||
import_out_metadata_box=new QCheckBox(tr("Export file metadata"),this);
|
||||
import_out_metadata_box->setGeometry(95,161,sizeHint().width()-210,15);
|
||||
import_out_metadata_box->setChecked(*import_import_metadata);
|
||||
import_out_metadata_box->setFont(label_font);
|
||||
@ -216,12 +208,11 @@ RDImportAudio::RDImportAudio(QString cutname,QString *path,
|
||||
//
|
||||
// Output Format
|
||||
//
|
||||
import_format_edit=new QLineEdit(this,"import_format_edit");
|
||||
import_format_edit=new QLineEdit(this);
|
||||
import_format_edit->setGeometry(85,181,sizeHint().width()-180,20);
|
||||
import_format_edit->setReadOnly(true);
|
||||
import_format_edit->setText(import_settings->description());
|
||||
import_format_label=new QLabel(import_out_filename_edit,tr("Format:"),
|
||||
this,"import_out_filename_label");
|
||||
import_format_label=new QLabel(import_out_filename_edit,tr("Format:"),this);
|
||||
import_format_label->setGeometry(10,181,70,20);
|
||||
import_format_label->setFont(label_font);
|
||||
import_format_label->setAlignment(AlignVCenter|AlignRight);
|
||||
@ -229,8 +220,7 @@ RDImportAudio::RDImportAudio(QString cutname,QString *path,
|
||||
//
|
||||
// Output Format Selector Button
|
||||
//
|
||||
import_out_format_button=
|
||||
new QPushButton(tr("S&et"),this,"import_out_format_button");
|
||||
import_out_format_button=new QPushButton(tr("S&et"),this);
|
||||
import_out_format_button->setGeometry(sizeHint().width()-85,178,70,26);
|
||||
connect(import_out_format_button,SIGNAL(clicked()),
|
||||
this,SLOT(selectOutputFormatData()));
|
||||
@ -238,13 +228,13 @@ RDImportAudio::RDImportAudio(QString cutname,QString *path,
|
||||
//
|
||||
// Progress Bar
|
||||
//
|
||||
import_bar=new RDBusyBar(this,"import_bar");
|
||||
import_bar=new RDBusyBar(this);
|
||||
import_bar->setGeometry(10,230,sizeHint().width()-20,20);
|
||||
|
||||
//
|
||||
// Normalize Check Box
|
||||
//
|
||||
import_normalize_box=new QCheckBox(tr("Normalize"),this,"import_normalize_box");
|
||||
import_normalize_box=new QCheckBox(tr("Normalize"),this);
|
||||
import_normalize_box->setGeometry(10,262,113,15);
|
||||
import_normalize_box->setChecked(true);
|
||||
import_normalize_box->setFont(label_font);
|
||||
@ -254,15 +244,14 @@ RDImportAudio::RDImportAudio(QString cutname,QString *path,
|
||||
//
|
||||
// Normalize Level
|
||||
//
|
||||
import_normalize_spin=new QSpinBox(this,"import_normalize_spin");
|
||||
import_normalize_spin=new QSpinBox(this);
|
||||
import_normalize_spin->setGeometry(160,260,40,20);
|
||||
import_normalize_spin->setRange(-30,0);
|
||||
import_normalize_label=new QLabel(import_normalize_spin,tr("Level:"),
|
||||
this,"normalize_spin_label");
|
||||
import_normalize_label=new QLabel(import_normalize_spin,tr("Level:"),this);
|
||||
import_normalize_label->setGeometry(110,260,45,20);
|
||||
import_normalize_label->setFont(label_font);
|
||||
import_normalize_label->setAlignment(AlignRight|AlignVCenter);
|
||||
import_normalize_unit=new QLabel(tr("dBFS"),this,"normalize_unit_label");
|
||||
import_normalize_unit=new QLabel(tr("dBFS"),this);
|
||||
import_normalize_unit->setGeometry(205,260,40,20);
|
||||
import_normalize_unit->setFont(label_font);
|
||||
import_normalize_unit->setAlignment(AlignLeft|AlignVCenter);
|
||||
@ -270,7 +259,7 @@ RDImportAudio::RDImportAudio(QString cutname,QString *path,
|
||||
//
|
||||
// Import Button
|
||||
//
|
||||
import_import_button=new QPushButton(tr("&Import"),this,"import_button");
|
||||
import_import_button=new QPushButton(tr("&Import"),this);
|
||||
import_import_button->
|
||||
setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50);
|
||||
import_import_button->setFont(button_font);
|
||||
@ -279,7 +268,7 @@ RDImportAudio::RDImportAudio(QString cutname,QString *path,
|
||||
//
|
||||
// Cancel Button
|
||||
//
|
||||
import_cancel_button=new QPushButton(tr("&Cancel"),this,"cancel_button");
|
||||
import_cancel_button=new QPushButton(tr("&Cancel"),this);
|
||||
import_cancel_button->
|
||||
setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50);
|
||||
import_cancel_button->setFont(button_font);
|
||||
@ -474,7 +463,7 @@ void RDImportAudio::selectOutputFileData()
|
||||
void RDImportAudio::selectOutputFormatData()
|
||||
{
|
||||
RDExportSettingsDialog *dialog=
|
||||
new RDExportSettingsDialog(import_settings,import_station,this,"dialog");
|
||||
new RDExportSettingsDialog(import_settings,import_station,this);
|
||||
dialog->exec();
|
||||
delete dialog;
|
||||
import_format_edit->setText(import_settings->description());
|
||||
|
||||
@ -2,9 +2,7 @@
|
||||
//
|
||||
// Audio File Importation Dialog for Rivendell.
|
||||
//
|
||||
// (C) Copyright 2002-2003,2010 Fred Gleason <fredg@paravelsystems.com>
|
||||
//
|
||||
// $Id: rdimport_audio.h,v 1.10 2010/07/29 19:32:33 cvs Exp $
|
||||
// (C) Copyright 2002-2015 Fred Gleason <fredg@paravelsystems.com>
|
||||
//
|
||||
// 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
|
||||
@ -63,7 +61,7 @@ class RDImportAudio : public QDialog
|
||||
RDImportAudio(QString cutname,QString *path,RDSettings *settings,
|
||||
bool *import_metadata,RDWaveData *wavedata,
|
||||
RDCut *clipboard,RDStation *station,RDUser *user,bool *running,
|
||||
RDConfig *config,QWidget *parent=0,const char *name=0);
|
||||
RDConfig *config,QWidget *parent=0);
|
||||
~RDImportAudio();
|
||||
QSize sizeHint() const;
|
||||
QSizePolicy sizePolicy() const;
|
||||
|
||||
@ -2,9 +2,7 @@
|
||||
//
|
||||
// Edit a Rivendell Feed
|
||||
//
|
||||
// (C) Copyright 2002-2004 Fred Gleason <fredg@paravelsystems.com>
|
||||
//
|
||||
// $Id: edit_feed.cpp,v 1.9 2012/01/16 11:16:36 cvs Exp $
|
||||
// (C) Copyright 2002-2015 Fred Gleason <fredg@paravelsystems.com>
|
||||
//
|
||||
// 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
|
||||
@ -579,7 +577,7 @@ void EditFeed::setFormatData()
|
||||
{
|
||||
RDStation *station=new RDStation(admin_config->stationName());
|
||||
RDExportSettingsDialog *dialog=
|
||||
new RDExportSettingsDialog(&feed_settings,station,this,"dialog");
|
||||
new RDExportSettingsDialog(&feed_settings,station,this);
|
||||
dialog->exec();
|
||||
delete dialog;
|
||||
delete station;
|
||||
|
||||
@ -2,9 +2,7 @@
|
||||
//
|
||||
// Edit a Rivendell Replicator
|
||||
//
|
||||
// (C) Copyright 2002-2004 Fred Gleason <fredg@paravelsystems.com>
|
||||
//
|
||||
// $Id: edit_replicator.cpp,v 1.2 2010/07/29 19:32:34 cvs Exp $
|
||||
// (C) Copyright 2002-2015 Fred Gleason <fredg@paravelsystems.com>
|
||||
//
|
||||
// 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
|
||||
@ -311,7 +309,7 @@ void EditReplicator::setFormatData()
|
||||
{
|
||||
RDStation *station=new RDStation(admin_config->stationName());
|
||||
RDExportSettingsDialog *dialog=
|
||||
new RDExportSettingsDialog(repl_settings,station,this,"dialog");
|
||||
new RDExportSettingsDialog(repl_settings,station,this);
|
||||
dialog->exec();
|
||||
delete dialog;
|
||||
delete station;
|
||||
|
||||
@ -2,9 +2,7 @@
|
||||
//
|
||||
// Edit a Rivendell Upload Event
|
||||
//
|
||||
// (C) Copyright 2002-2005 Fred Gleason <fredg@paravelsystems.com>
|
||||
//
|
||||
// $Id: edit_upload.cpp,v 1.22 2011/06/21 18:31:33 cvs Exp $
|
||||
// (C) Copyright 2002-2015 Fred Gleason <fredg@paravelsystems.com>
|
||||
//
|
||||
// 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
|
||||
@ -533,7 +531,7 @@ void EditUpload::setFormatData()
|
||||
{
|
||||
RDStation *station=new RDStation(edit_station_box->currentText());
|
||||
RDExportSettingsDialog *dialog=
|
||||
new RDExportSettingsDialog(&edit_settings,station,this,"dialog");
|
||||
new RDExportSettingsDialog(&edit_settings,station,this);
|
||||
dialog->exec();
|
||||
delete dialog;
|
||||
delete station;
|
||||
@ -640,6 +638,7 @@ bool EditUpload::CheckFormat()
|
||||
RDStation *station=new RDStation(edit_station_box->currentText());
|
||||
switch(edit_settings.format()) {
|
||||
case RDSettings::Pcm16:
|
||||
case RDSettings::Pcm24:
|
||||
case RDSettings::MpegL2:
|
||||
case RDSettings::MpegL2Wav:
|
||||
res=true;
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
//
|
||||
// Rivendell web service portal -- Export service
|
||||
//
|
||||
// (C) Copyright 2010,2014 Fred Gleason <fredg@paravelsystems.com>
|
||||
// (C) Copyright 2010-2015 Fred Gleason <fredg@paravelsystems.com>
|
||||
//
|
||||
// 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
|
||||
@ -145,6 +145,7 @@ void Xport::Export()
|
||||
case RDAudioConvert::ErrorOk:
|
||||
switch(settings->format()) {
|
||||
case RDSettings::Pcm16:
|
||||
case RDSettings::Pcm24:
|
||||
printf("Content-type: audio/x-wav\n\n");
|
||||
break;
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user