Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-12-05 08:10:21 +01:00
Code Issues Projects Releases Wiki Activity

2023-12-15 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a regression in rdcatch(1) that broke play-out of the
	head and tail audition buttons.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2023-12-15 17:19:24 -05:00
parent af8b711649
commit ca83dfd0ac
3 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -24562,3 +24562,6 @@
2023-12-15 Fred Gleason <fredg@paravelsystems.com> 2023-12-15 Fred Gleason <fredg@paravelsystems.com>
* Fixed a race in the log machine logic that could cause truncated * Fixed a race in the log machine logic that could cause truncated
play-outs with segue transitions. play-outs with segue transitions.
2023-12-15 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdcatch(1) that broke play-out of the
head and tail audition buttons.

38
rdcatch/rdcatch.cpp
View File

@@ -146,9 +146,9 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent)
// CAE Connection // CAE Connection
// //
connect(rda->cae(),SIGNAL(isConnected(bool)),this,SLOT(initData(bool))); connect(rda->cae(),SIGNAL(isConnected(bool)),this,SLOT(initData(bool)));
connect(rda->cae(),SIGNAL(playing(int)),this,SLOT(playedData(int))); connect(rda->cae(),SIGNAL(playing(unsigned)),this,SLOT(playedData(unsigned)));
connect(rda->cae(),SIGNAL(playStopped(int)), connect(rda->cae(),SIGNAL(playStopped(unsigned)),
this,SLOT(playStoppedData(int))); this,SLOT(playStoppedData(unsigned)));
if(!rda->cae()->connectHost(&err_msg)) { if(!rda->cae()->connectHost(&err_msg)) {
QMessageBox::warning(this,"RDCatch - "+tr("Error"),err_msg); QMessageBox::warning(this,"RDCatch - "+tr("Error"),err_msg);
exit(RDCoreApplication::ExitInternalError); exit(RDCoreApplication::ExitInternalError);
@@ -778,26 +778,30 @@ void MainWidget::initData(bool state)
} }
void MainWidget::playedData(int handle) void MainWidget::playedData(unsigned serial)
{ {
if(head_playing) { if(catch_audition_serial==serial) {
catch_head_button->on(); if(head_playing) {
catch_head_button->on();
}
if(tail_playing) {
catch_tail_button->on();
}
catch_stop_button->off();
} }
if(tail_playing) {
catch_tail_button->on();
}
catch_stop_button->off();
} }
void MainWidget::playStoppedData(int handle) void MainWidget::playStoppedData(unsigned serial)
{ {
head_playing=false; if(catch_audition_serial==serial) {
tail_playing=false; head_playing=false;
catch_head_button->off(); tail_playing=false;
catch_tail_button->off(); catch_head_button->off();
catch_stop_button->on(); catch_tail_button->off();
rda->cae()->unloadPlay(catch_audition_serial); catch_stop_button->on();
rda->cae()->unloadPlay(catch_audition_serial);
}
} }

4
rdcatch/rdcatch.h
View File

@@ -69,8 +69,8 @@ class MainWidget : public RDMainWindow
void tailButtonData(); void tailButtonData();
void stopButtonData(); void stopButtonData();
void initData(bool); void initData(bool);
void playedData(int); void playedData(unsigned serial);
void playStoppedData(int); void playStoppedData(unsigned serial);
void selectionChangedData(const QItemSelection &before, void selectionChangedData(const QItemSelection &before,
const QItemSelection &after); const QItemSelection &after);
void doubleClickedData(const QModelIndex &index); void doubleClickedData(const QModelIndex &index);