Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-11-05 16:43:54 +01:00
Code Issues Projects Releases Wiki Activity

2023-02-28 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a regression in rdadmin(1) that caused the
	'Configure RDLogEdit' dialog save the 'Bitrate' value to
	'128 kbps/chan' when using 'MPEG Layer 2' format regardless of the
	setting of the 'Bitrate' control.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2023-02-28 11:30:12 -05:00
parent 9e7c0e51c3
commit 6570921b7c
4 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -23985,3 +23985,8 @@
2023-02-23 Fred Gleason <fredg@paravelsystems.com> 2023-02-23 Fred Gleason <fredg@paravelsystems.com>
* Changed the value of the 'Password=' directive in the '[mySQL]' * Changed the value of the 'Password=' directive in the '[mySQL]'
section of 'conf/rd.conf-sample' to 'hackme'. section of 'conf/rd.conf-sample' to 'hackme'.
2023-02-28 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdadmin(1) that caused the
'Configure RDLogEdit' dialog save the 'Bitrate' value to
'128 kbps/chan' when using 'MPEG Layer 2' format regardless of the
setting of the 'Bitrate' control.

BIN
docs/opsguide/rdadmin.configure_rdlogedit_dialog.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 48 KiB

6
docs/opsguide/rdadmin.xml
View File

@@ -1739,12 +1739,6 @@
the transition type to use by default when adding a new log the transition type to use by default when adding a new log
event. event.
</para> </para>
<para>
The <computeroutput>Allow Multiple Instances</computeroutput>, if set
to <userinput>Yes</userinput>, will allow multiple, independent
instances of <command>rdlogedit</command><manvolnum>1</manvolnum> to
be run simultaneously.
</para>
</sect2> </sect2>
<sect2 xml:id="sect.rdadmin.manage_hosts.configuring_rdcartslots"> <sect2 xml:id="sect.rdadmin.manage_hosts.configuring_rdcartslots">
<title>Configuring RDCartSlots</title> <title>Configuring RDCartSlots</title>

26
rdadmin/edit_rdlogedit.cpp
View File

@@ -158,11 +158,15 @@ EditRDLogedit::EditRDLogedit(RDStation *station,RDStation *cae_station,
// Bitrate // Bitrate
// //
lib_bitrate_box=new QComboBox(this); lib_bitrate_box=new QComboBox(this);
lib_bitrate_box->setGeometry(180,220,130,19); lib_bitrate_box->setGeometry(180,220,60,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,220,150,19); lib_bitrate_label->setGeometry(25,220,150,19);
lib_bitrate_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); lib_bitrate_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
QLabel *lib_bitrate_unit=new QLabel(tr("kbps/chan"),this);
lib_bitrate_unit->setFont(labelFont());
lib_bitrate_unit->setGeometry(245,220,150,19);
lib_bitrate_unit->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
// //
// Enable Second Start Button // Enable Second Start Button
@@ -515,16 +519,16 @@ void EditRDLogedit::ShowBitRates(int index,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->bitrate()) { switch(lib_lib->bitrate()) {
case 32000: case 32000:
lib_bitrate_box->setCurrentIndex(0); lib_bitrate_box->setCurrentIndex(0);