From 1b0d3dc9fdf24f74f3522534acea24736953e769 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Wed, 20 Apr 2022 15:41:01 -0400 Subject: [PATCH] 2022-04-20 Fred Gleason * Fixed a bug in rdadmin(1) that caused a bitrate value of '0' to be saved to 'RECORDINGS.BITRATE' field in the database regardless of the setting in the 'Configure RDCatch' dialog. Signed-off-by: Fred Gleason --- ChangeLog | 4 ++++ lib/rdexport_settings_dialog.cpp | 17 +++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8d8dceea..dd84cd7e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22983,3 +22983,7 @@ * Fixed a bug in rdadmin(1) that caused a bitrate value of '0' to be saved to 'RECORDINGS.BITRATE' field in the database regardless of the setting in the 'Configure RDCatch' dialog. +2022-04-20 Fred Gleason + * Fixed a regression in rdcatch(1) that caused the 'Sample Rate' + dropdown in the 'Edit Audio Settings' dialog to always be set + to '32000' regardless of the actual value in the record. diff --git a/lib/rdexport_settings_dialog.cpp b/lib/rdexport_settings_dialog.cpp index 016e9979..ab3f60a4 100644 --- a/lib/rdexport_settings_dialog.cpp +++ b/lib/rdexport_settings_dialog.cpp @@ -2,7 +2,7 @@ // // Edit Audio Export Settings // -// (C) Copyright 2002-2021 Fred Gleason +// (C) Copyright 2002-2021\2 Fred Gleason // // 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 @@ -240,14 +240,15 @@ int RDExportSettingsDialog::exec(RDSettings *s,unsigned id) lib_channels_box->insertItem(lib_channels_box->count(),"1"); lib_channels_box->insertItem(lib_channels_box->count(),"2"); lib_channels_box->setCurrentIndex(lib_settings->channels()-1); - lib_samprate_box->insertItem(lib_samprate_box->count(),"16000"); - lib_samprate_box->insertItem(lib_samprate_box->count(),"22050"); - lib_samprate_box->insertItem(lib_samprate_box->count(),"24000"); - lib_samprate_box->insertItem(lib_samprate_box->count(),"32000"); - lib_samprate_box->insertItem(lib_samprate_box->count(),"44100"); - lib_samprate_box->insertItem(lib_samprate_box->count(),"48000"); + lib_samprate_box->insertItem(lib_samprate_box->count(),"16000",16000); + lib_samprate_box->insertItem(lib_samprate_box->count(),"22050",22050); + lib_samprate_box->insertItem(lib_samprate_box->count(),"24000",24000); + lib_samprate_box->insertItem(lib_samprate_box->count(),"32000",32000); + lib_samprate_box->insertItem(lib_samprate_box->count(),"44100",44100); + lib_samprate_box->insertItem(lib_samprate_box->count(),"48000",48000); for(int i=0;icount();i++) { - if(lib_samprate_box->itemData(i).toString().toUInt()==lib_settings->sampleRate()) { + if(lib_samprate_box->itemData(i).toString().toUInt()== + lib_settings->sampleRate()) { lib_samprate_box->setCurrentIndex(i); } }