Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-07-04 14:39:09 +02:00
Code Issues Projects Releases Wiki Activity

2021-07-28 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in rdlogedit(1) that caused the 'Audio
	Parameters' controls to fail to be disabled when the 'Render To'
	control was set to 'Cart/Cut'.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-07-28 15:44:56 -04:00
parent e9bbf022e1
commit b2fc15ffef
5 changed files with 87 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -22108,3 +22108,7 @@
* Fixed a bug in rdlogedit(1) that caused the 'Audio * Fixed a bug in rdlogedit(1) that caused the 'Audio
Parameters' controls to fail to be disabled when the 'Render To' Parameters' controls to fail to be disabled when the 'Render To'
control was set to 'Cart/Cut'. control was set to 'Cart/Cut'.
2021-07-28 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in the 'Edit Audio Settings'
('RDExportSettingsDialog') dialog that made it impossible to
select any sample rate other than 32000.

146
lib/rdexport_settings_dialog.cpp
View File

@ -78,12 +78,15 @@ RDExportSettingsDialog::RDExportSettingsDialog(const QString &caption,
// //
// Bitrate // Bitrate
// //
lib_bitrate_box=new QComboBox(this);
connect(lib_bitrate_box,SIGNAL(activated(const QString &)),
this,SLOT(bitrateData(const QString &)));
lib_bitrate_label=new QLabel(tr("Bitrate")+":",this); lib_bitrate_label=new QLabel(tr("Bitrate")+":",this);
lib_bitrate_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); lib_bitrate_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
lib_bitrate_label->setFont(labelFont()); lib_bitrate_label->setFont(labelFont());
lib_bitrate_box=new QComboBox(this);
connect(lib_bitrate_box,SIGNAL(activated(const QString &)),
this,SLOT(bitrateData(const QString &)));
lib_bitrate_unit=new QLabel("kbps",this);
lib_bitrate_unit->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
lib_bitrate_unit->setFont(labelFont());
// //
// Quality // Quality
@ -401,7 +404,8 @@ void RDExportSettingsDialog::resizeEvent(QResizeEvent *e)
ypos+=22; ypos+=22;
lib_bitrate_label->setGeometry(10,ypos,135,19); lib_bitrate_label->setGeometry(10,ypos,135,19);
lib_bitrate_box->setGeometry(150,ypos,100,19); lib_bitrate_box->setGeometry(150,ypos,50,19);
lib_bitrate_unit->setGeometry(205,ypos,size().width()-215,19);
ypos+=22; ypos+=22;
lib_quality_label->setGeometry(10,ypos,135,19); lib_quality_label->setGeometry(10,ypos,135,19);
@ -427,6 +431,8 @@ void RDExportSettingsDialog::ShowBitRates(RDSettings::Format fmt,
int new_samprate, int new_samprate,
int bitrate,int qual) int bitrate,int qual)
{ {
printf("ShowBitRates: fmt: %u new_samprate: %u bitrate: %u qual: %u\n",
fmt,new_samprate,bitrate,qual);
int samprate=lib_samprate_box->currentText().toInt(); int samprate=lib_samprate_box->currentText().toInt();
int channels=lib_channels_box->currentText().toInt(); int channels=lib_channels_box->currentText().toInt();
lib_channels_box->clear(); lib_channels_box->clear();
@ -456,21 +462,21 @@ void RDExportSettingsDialog::ShowBitRates(RDSettings::Format fmt,
lib_samprate_box->insertItem(lib_samprate_box->count(),"48000"); lib_samprate_box->insertItem(lib_samprate_box->count(),"48000");
lib_bitrate_box->setEnabled(true); lib_bitrate_box->setEnabled(true);
lib_bitrate_label->setEnabled(true); lib_bitrate_label->setEnabled(true);
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("32 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"32");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("64 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"64");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("96 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"96");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("128 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"128");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("160 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"160");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("192 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"192");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("224 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"224");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("256 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"256");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("288 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"288");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("320 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"320");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("352 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"352");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("384 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"384");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("416 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"416");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("448 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"448");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("VBR")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"VBR");
switch(bitrate) { switch(bitrate) {
case 0: case 0:
lib_bitrate_box->setCurrentIndex(14); lib_bitrate_box->setCurrentIndex(14);
@ -577,20 +583,20 @@ void RDExportSettingsDialog::ShowBitRates(RDSettings::Format fmt,
lib_samprate_box->insertItem(lib_samprate_box->count(),"48000"); lib_samprate_box->insertItem(lib_samprate_box->count(),"48000");
lib_bitrate_box->setEnabled(true); lib_bitrate_box->setEnabled(true);
lib_bitrate_label->setEnabled(true); lib_bitrate_label->setEnabled(true);
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("32 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"32");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("48 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"48");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("56 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"56");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("64 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"64");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("80 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"80");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("96 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"96");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("112 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"112");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("128 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"128");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("160 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"160");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("192 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"192");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("224 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"224");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("256 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"256");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("320 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"320");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("384 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"384");
switch(bitrate) { switch(bitrate) {
case 0: case 0:
lib_bitrate_box->setCurrentIndex(11); lib_bitrate_box->setCurrentIndex(11);
@ -697,21 +703,21 @@ void RDExportSettingsDialog::ShowBitRates(RDSettings::Format fmt,
case 44100: case 44100:
case 48000: case 48000:
default: default:
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("32 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"32");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("40 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"40");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("48 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"48");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("56 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"56");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("64 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"64");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("80 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"80");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("96 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"96");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("112 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"112");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("128 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"128");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("160 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"160");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("192 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"192");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("224 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"224");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("256 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"256");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("320 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"320");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("VBR")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"VBR");
switch(bitrate) { switch(bitrate) {
case 0: case 0:
lib_bitrate_box->setCurrentIndex(14); lib_bitrate_box->setCurrentIndex(14);
@ -810,21 +816,21 @@ void RDExportSettingsDialog::ShowBitRates(RDSettings::Format fmt,
case 16000: case 16000:
case 22050: case 22050:
case 24000: case 24000:
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("8 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"8");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("16 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"16");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("24 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"24");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("32 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"32");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("40 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"40");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("48 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"48");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("56 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"56");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("64 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"64");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("80 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"80");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("96 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"96");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("112 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"112");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("128 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"128");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("144 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"144");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("160 kbps")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"160");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("VBR")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"VBR");
switch(bitrate) { switch(bitrate) {
case 0: case 0:
lib_bitrate_box->setCurrentIndex(14); lib_bitrate_box->setCurrentIndex(14);
@ -948,18 +954,8 @@ void RDExportSettingsDialog::ShowBitRates(RDSettings::Format fmt,
lib_quality_spin->setValue(qual); lib_quality_spin->setValue(qual);
break; break;
} }
SetCurrentItem(lib_channels_box,channels); lib_channels_box->setCurrentText(QString().sprintf("%u",channels));
SetCurrentItem(lib_samprate_box,samprate); lib_samprate_box->setCurrentText(QString().sprintf("%u",samprate));
}
void RDExportSettingsDialog::SetCurrentItem(QComboBox *box,int value)
{
for(int i=0;i<box->count();i++) {
if(box->itemData(i).toString().toInt()==value) {
box->setCurrentIndex(i);
}
}
} }

12
lib/rdexport_settings_dialog.h
View File

@ -2,7 +2,7 @@
// //
// Edit Rivendell Audio Settings // Edit Rivendell Audio Settings
// //
// (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // 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 // it under the terms of the GNU General Public License version 2 as
@ -21,10 +21,10 @@
#ifndef RDEXPORT_SETTINGS_DIALOG_H #ifndef RDEXPORT_SETTINGS_DIALOG_H
#define RDEXPORT_SETTINGS_DIALOG_H #define RDEXPORT_SETTINGS_DIALOG_H
#include <qcombobox.h> #include <QComboBox>
#include <qlabel.h> #include <QLabel>
#include <qlineedit.h> #include <QLineEdit>
#include <qspinbox.h> #include <QSpinBox>
#include <rddialog.h> #include <rddialog.h>
#include <rdsettings.h> #include <rdsettings.h>
@ -55,7 +55,6 @@ class RDExportSettingsDialog : public RDDialog
private: private:
void ShowBitRates(RDSettings::Format fmt,int samprate,int bitrate,int qual); void ShowBitRates(RDSettings::Format fmt,int samprate,int bitrate,int qual);
void SetCurrentItem(QComboBox *box,int value);
RDSettings::Format GetFormat(QString str); RDSettings::Format GetFormat(QString str);
RDSettings *lib_settings; RDSettings *lib_settings;
QLabel *lib_name_label; QLabel *lib_name_label;
@ -68,6 +67,7 @@ class RDExportSettingsDialog : public RDDialog
QComboBox *lib_channels_box; QComboBox *lib_channels_box;
QLabel *lib_bitrate_label; QLabel *lib_bitrate_label;
QComboBox *lib_bitrate_box; QComboBox *lib_bitrate_box;
QLabel *lib_bitrate_unit;
bool lib_normalization_level_enabled; bool lib_normalization_level_enabled;
QLabel *lib_normalization_level_label; QLabel *lib_normalization_level_label;
QSpinBox *lib_normalization_level_spin; QSpinBox *lib_normalization_level_spin;

8
rdlogedit/render_dialog.cpp
View File

@ -25,7 +25,6 @@
#include <qpushbutton.h> #include <qpushbutton.h>
#include <rdconf.h> #include <rdconf.h>
#include <rdexport_settings_dialog.h>
#include <rdrenderer.h> #include <rdrenderer.h>
#include "render_dialog.h" #include "render_dialog.h"
@ -48,6 +47,7 @@ RenderDialog::RenderDialog(QWidget *parent)
// //
// Dialogs // Dialogs
// //
render_settings_dialog=new RDExportSettingsDialog("RDLogEdit",this);
render_progress_dialog= render_progress_dialog=
new QProgressDialog(tr("Rendering Log..."),tr("Cancel"),0,0,this); new QProgressDialog(tr("Rendering Log..."),tr("Cancel"),0,0,this);
render_progress_dialog->setWindowTitle(tr("Render Progress")); render_progress_dialog->setWindowTitle(tr("Render Progress"));
@ -164,6 +164,8 @@ RenderDialog::RenderDialog(QWidget *parent)
RenderDialog::~RenderDialog() RenderDialog::~RenderDialog()
{ {
delete render_progress_dialog;
delete render_settings_dialog;
} }
@ -245,11 +247,9 @@ void RenderDialog::starttimeSourceData(int item)
void RenderDialog::audiosettingsData() void RenderDialog::audiosettingsData()
{ {
RDExportSettingsDialog *d=new RDExportSettingsDialog("RDLogEdit",this); if(render_settings_dialog->exec(render_settings)) {
if(d->exec(render_settings)) {
render_audiosettings_edit->setText(render_settings->description()); render_audiosettings_edit->setText(render_settings->description());
} }
delete d;
} }

5
rdlogedit/render_dialog.h
View File

@ -26,6 +26,7 @@
#include <rdcut_dialog.h> #include <rdcut_dialog.h>
#include <rddialog.h> #include <rddialog.h>
#include <rdexport_settings_dialog.h>
#include <rdlogmodel.h> #include <rdlogmodel.h>
// //
@ -60,14 +61,12 @@ class RenderDialog : public RDDialog
void resizeEvent(QResizeEvent *e); void resizeEvent(QResizeEvent *e);
private: private:
// RDStation *render_station;
// RDSystem *render_system;
// RDConfig *render_config;
RDUser *render_user; RDUser *render_user;
RDLogModel *render_model; RDLogModel *render_model;
int render_first_line; int render_first_line;
int render_last_line; int render_last_line;
RDSettings *render_settings; RDSettings *render_settings;
RDExportSettingsDialog *render_settings_dialog;
RDCutDialog *render_cut_dialog; RDCutDialog *render_cut_dialog;
QProgressDialog *render_progress_dialog; QProgressDialog *render_progress_dialog;
QLabel *render_to_label; QLabel *render_to_label;