Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-24 00:21:41 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* Fixed a regression in rdadmin(1) that caused the 'Bitrate'
	parameter in the 'Configure RDLibrary' dialog to always save
	'0' as the value.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-07-28 11:15:43 -04:00
parent 7f93c17965
commit 129bebc7e3
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -22100,3 +22100,7 @@
2021-07-28 Fred Gleason <fredg@paravelsystems.com> 2021-07-28 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdlogedit(1) that caused the rendering * Fixed a regression in rdlogedit(1) that caused the rendering
progress dialog to appear when there was no render being processed. progress dialog to appear when there was no render being processed.
2021-07-28 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdadmin(1) that caused the 'Bitrate'
parameter in the 'Configure RDLibrary' dialog to always save
'0' as the value.

27
rdadmin/edit_rdlibrary.cpp
View File

@ -228,12 +228,17 @@ EditRDLibrary::EditRDLibrary(RDStation *station,RDStation *cae_station,
// Bitrate // Bitrate
// //
lib_bitrate_box=new QComboBox(this); lib_bitrate_box=new QComboBox(this);
lib_bitrate_box->setGeometry(190,326,130,19); lib_bitrate_box->setGeometry(190,326,50,19);
QLabel *lib_bitrate_label=new QLabel(tr("Bitrate:"),this); QLabel *lib_bitrate_label=new QLabel(tr("Bitrate:"),this);
lib_bitrate_label->setFont(labelFont()); lib_bitrate_label->setFont(labelFont());
lib_bitrate_label->setGeometry(25,326,160,19); lib_bitrate_label->setGeometry(25,326,160,19);
lib_bitrate_label-> lib_bitrate_label->
setAlignment(Qt::AlignRight|Qt::AlignVCenter); setAlignment(Qt::AlignRight|Qt::AlignVCenter);
QLabel *lib_bitrate_unit=new QLabel("kbps/chan",this);
lib_bitrate_unit->setFont(labelFont());
lib_bitrate_unit->setGeometry(245,326,160,19);
lib_bitrate_unit->
setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
// //
// Enable Editor // Enable Editor
@ -585,16 +590,16 @@ void EditRDLibrary::ShowBitRates(int layer,int rate)
case 2: // MPEG-1 Layer 2 case 2: // MPEG-1 Layer 2
lib_bitrate_box->setEnabled(true); lib_bitrate_box->setEnabled(true);
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("32 kbps/chan")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"32");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("48 kbps/chan")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"48");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("56 kbps/chan")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"56");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("64 kbps/chan")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"64");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("80 kbps/chan")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"80");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("96 kbps/chan")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"96");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("112 kbps/chan")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"112");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("128 kbps/chan")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"128");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("160 kbps/chan")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"160");
lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("192 kbps/chan")); lib_bitrate_box->insertItem(lib_bitrate_box->count(),"192");
switch(lib_lib->defaultBitrate()) { switch(lib_lib->defaultBitrate()) {
case 32000: case 32000:
lib_bitrate_box->setCurrentIndex(0); lib_bitrate_box->setCurrentIndex(0);