diff --git a/ChangeLog b/ChangeLog index d9f5fbf6..da26f838 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23985,3 +23985,8 @@ 2023-02-23 Fred Gleason * Changed the value of the 'Password=' directive in the '[mySQL]' section of 'conf/rd.conf-sample' to 'hackme'. +2023-02-28 Fred Gleason + * 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. diff --git a/docs/opsguide/rdadmin.configure_rdlogedit_dialog.png b/docs/opsguide/rdadmin.configure_rdlogedit_dialog.png index f69f5404..d1154ab8 100644 Binary files a/docs/opsguide/rdadmin.configure_rdlogedit_dialog.png and b/docs/opsguide/rdadmin.configure_rdlogedit_dialog.png differ diff --git a/docs/opsguide/rdadmin.xml b/docs/opsguide/rdadmin.xml index 30f51f25..cdbfabab 100644 --- a/docs/opsguide/rdadmin.xml +++ b/docs/opsguide/rdadmin.xml @@ -1739,12 +1739,6 @@ the transition type to use by default when adding a new log event. - - The Allow Multiple Instances, if set - to Yes, will allow multiple, independent - instances of rdlogedit1 to - be run simultaneously. - Configuring RDCartSlots diff --git a/rdadmin/edit_rdlogedit.cpp b/rdadmin/edit_rdlogedit.cpp index 28f95ffa..5d52fb2e 100644 --- a/rdadmin/edit_rdlogedit.cpp +++ b/rdadmin/edit_rdlogedit.cpp @@ -158,11 +158,15 @@ EditRDLogedit::EditRDLogedit(RDStation *station,RDStation *cae_station, // Bitrate // 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); lib_bitrate_label->setFont(labelFont()); lib_bitrate_label->setGeometry(25,220,150,19); 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 @@ -515,16 +519,16 @@ void EditRDLogedit::ShowBitRates(int index,int rate) case 2: // MPEG-1 Layer 2 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(),tr("48 kbps/chan")); - lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("56 kbps/chan")); - lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("64 kbps/chan")); - lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("80 kbps/chan")); - lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("96 kbps/chan")); - lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("112 kbps/chan")); - lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("128 kbps/chan")); - lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("160 kbps/chan")); - lib_bitrate_box->insertItem(lib_bitrate_box->count(),tr("192 kbps/chan")); + lib_bitrate_box->insertItem(lib_bitrate_box->count(),"32"); + lib_bitrate_box->insertItem(lib_bitrate_box->count(),"48"); + lib_bitrate_box->insertItem(lib_bitrate_box->count(),"56"); + lib_bitrate_box->insertItem(lib_bitrate_box->count(),"64"); + lib_bitrate_box->insertItem(lib_bitrate_box->count(),"80"); + lib_bitrate_box->insertItem(lib_bitrate_box->count(),"96"); + lib_bitrate_box->insertItem(lib_bitrate_box->count(),"112"); + lib_bitrate_box->insertItem(lib_bitrate_box->count(),"128"); + lib_bitrate_box->insertItem(lib_bitrate_box->count(),"160"); + lib_bitrate_box->insertItem(lib_bitrate_box->count(),"192"); switch(lib_lib->bitrate()) { case 32000: lib_bitrate_box->setCurrentIndex(0);