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

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

Browse Source 
* Fixed a bug in rdcatch(1) that caused switch event endpoints
	to be sorted alphabetically rather than by endpoint number in
	the 'Edit Switcher Event' dialog.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2022-08-04 13:48:11 -04:00
parent 9655cb9f6b
commit 8949fcc3fb
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -23216,3 +23216,7 @@
'next event' to disappear after changing the filtering settings. 'next event' to disappear after changing the filtering settings.
2022-08-03 Fred Gleason <fredg@paravelsystems.com> 2022-08-03 Fred Gleason <fredg@paravelsystems.com>
* Incremented the package version to 4.0.0beta3int2. * Incremented the package version to 4.0.0beta3int2.
2022-08-04 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rdcatch(1) that caused switch event endpoints
to be sorted alphabetically rather than by endpoint number in
the 'Edit Switcher Event' dialog.

4
rdcatch/edit_switchevent.cpp
View File

@ -247,7 +247,7 @@ void EditSwitchEvent::activateMatrixData(const QString &str)
"from `INPUTS` where "+ "from `INPUTS` where "+
"(`STATION_NAME`='"+RDEscapeString(edit_event_widget->stationName())+"')&&"+ "(`STATION_NAME`='"+RDEscapeString(edit_event_widget->stationName())+"')&&"+
QString::asprintf("(`MATRIX`=%d) ",GetMatrix())+ QString::asprintf("(`MATRIX`=%d) ",GetMatrix())+
"order by `NAME`"; "order by `NUMBER`";
edit_input_box->clear(); edit_input_box->clear();
edit_input_box->insertItem(tr("--OFF--")); edit_input_box->insertItem(tr("--OFF--"));
int input=edit_recording->switchSource(); int input=edit_recording->switchSource();
@ -275,7 +275,7 @@ void EditSwitchEvent::activateMatrixData(const QString &str)
"from `OUTPUTS` where "+ "from `OUTPUTS` where "+
"(`STATION_NAME`='"+RDEscapeString(edit_event_widget->stationName())+"')&&"+ "(`STATION_NAME`='"+RDEscapeString(edit_event_widget->stationName())+"')&&"+
QString::asprintf("(`MATRIX`=%d) ",GetMatrix())+ QString::asprintf("(`MATRIX`=%d) ",GetMatrix())+
"order by `NAME`"; "order by `NUMBER`";
edit_output_box->clear(); edit_output_box->clear();
int output=edit_recording->switchDestination(); int output=edit_recording->switchDestination();
if((outputs=edit_matrix->outputs())>0) { if((outputs=edit_matrix->outputs())>0) {