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

2022-04-20 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* 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 <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2022-04-20 15:19:07 -04:00
parent de6abc01be
commit c22a040c92
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -22979,3 +22979,7 @@
* Fixed a bug in the 'Marker Viewer' dialog that caused the cursor * Fixed a bug in the 'Marker Viewer' dialog that caused the cursor
to be repositioned to outside of the waveform viewport when zooming to be repositioned to outside of the waveform viewport when zooming
into or out from the waveform. into or out from the waveform.
2022-04-20 Fred Gleason <fredg@paravelsystems.com>
* 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.

29
rdadmin/edit_decks.cpp
View File

@ -329,16 +329,20 @@ EditDecks::EditDecks(RDStation *station,RDStation *cae_station,QWidget *parent)
edit_format_box->insertItem(edit_format_box->count(),tr("MPEG Layer 2")); edit_format_box->insertItem(edit_format_box->count(),tr("MPEG Layer 2"));
edit_channels_box->insertItem(0,"1"); edit_channels_box->insertItem(0,"1");
edit_channels_box->insertItem(1,"2"); edit_channels_box->insertItem(1,"2");
edit_bitrate_box->insertItem(edit_bitrate_box->count(),tr("32 kbps/chan")); edit_bitrate_box->insertItem(edit_bitrate_box->count(),tr("32 kbps/chan"),32);
edit_bitrate_box->insertItem(edit_bitrate_box->count(),tr("48 kbps/chan")); edit_bitrate_box->insertItem(edit_bitrate_box->count(),tr("48 kbps/chan"),48);
edit_bitrate_box->insertItem(edit_bitrate_box->count(),tr("56 kbps/chan")); edit_bitrate_box->insertItem(edit_bitrate_box->count(),tr("56 kbps/chan"),56);
edit_bitrate_box->insertItem(edit_bitrate_box->count(),tr("64 kbps/chan")); edit_bitrate_box->insertItem(edit_bitrate_box->count(),tr("64 kbps/chan"),64);
edit_bitrate_box->insertItem(edit_bitrate_box->count(),tr("80 kbps/chan")); edit_bitrate_box->insertItem(edit_bitrate_box->count(),tr("80 kbps/chan"),80);
edit_bitrate_box->insertItem(edit_bitrate_box->count(),tr("96 kbps/chan")); edit_bitrate_box->insertItem(edit_bitrate_box->count(),tr("96 kbps/chan"),96);
edit_bitrate_box->insertItem(edit_bitrate_box->count(),tr("112 kbps/chan")); edit_bitrate_box->
edit_bitrate_box->insertItem(edit_bitrate_box->count(),tr("128 kbps/chan")); insertItem(edit_bitrate_box->count(),tr("112 kbps/chan"),112);
edit_bitrate_box->insertItem(edit_bitrate_box->count(),tr("160 kbps/chan")); edit_bitrate_box->
edit_bitrate_box->insertItem(edit_bitrate_box->count(),tr("192 kbps/chan")); insertItem(edit_bitrate_box->count(),tr("128 kbps/chan"),128);
edit_bitrate_box->
insertItem(edit_bitrate_box->count(),tr("160 kbps/chan"),160);
edit_bitrate_box->
insertItem(edit_bitrate_box->count(),tr("192 kbps/chan"),192);
ReadRecord(edit_record_channel); ReadRecord(edit_record_channel);
ReadRecord(edit_play_channel); ReadRecord(edit_play_channel);
ReadRecord(0); ReadRecord(0);
@ -698,7 +702,6 @@ void EditDecks::ReadRecord(int chan)
void EditDecks::WriteRecord(int chan) void EditDecks::WriteRecord(int chan)
{ {
int temp;
QString sql; QString sql;
RDSqlQuery *q; RDSqlQuery *q;
unsigned cartnum=0; unsigned cartnum=0;
@ -736,8 +739,8 @@ void EditDecks::WriteRecord(int chan)
break; break;
} }
edit_record_deck->setDefaultChannels(edit_channels_box->currentIndex()+1); edit_record_deck->setDefaultChannels(edit_channels_box->currentIndex()+1);
temp=edit_bitrate_box->currentText().toInt(); edit_record_deck->setDefaultBitrate(1000*edit_bitrate_box->
edit_record_deck->setDefaultBitrate(temp*1000); itemData(edit_bitrate_box->currentIndex()).toInt());
edit_record_deck->setSwitchStation(edit_swstation_box->currentText()); edit_record_deck->setSwitchStation(edit_swstation_box->currentText());
edit_record_deck->setSwitchMatrix(GetMatrix()); edit_record_deck->setSwitchMatrix(GetMatrix());
edit_record_deck->setSwitchOutput(GetOutput()); edit_record_deck->setSwitchOutput(GetOutput());