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

2021-02-25 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed regressions in rdcartslots(1) that caused widgets to fail
	to update properly after reloading slots.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-02-25 13:35:35 -05:00
parent 1f3286ac10
commit 6ee9578318
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -21220,3 +21220,6 @@
2021-02-25 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdimport(1) that caused it to fail to
start in dropbox mode.
2021-02-25 Fred Gleason <fredg@paravelsystems.com>
* Fixed regressions in rdcartslots(1) that caused widgets to fail
to update properly after reloading slots.

8
lib/rdcartslot.cpp
View File

@ -413,7 +413,7 @@ void RDCartSlot::doubleClickedData()
loadData();
}
else {
if(slot_cue_dialog->exec(slot_logline)==0) {
if(slot_cue_dialog->exec(slot_logline)) {
slot_box->setBarMode(true);
slot_box->setCart(slot_logline);
}
@ -431,7 +431,7 @@ void RDCartSlot::loadData()
cartnum=slot_logline->cartNumber();
if(cartnum==0) {
if(slot_cart_dialog->exec(&cartnum,RDCart::All,QString(),
&slot_temp_cart)==0) {
&slot_temp_cart)) {
load(cartnum);
}
}
@ -441,7 +441,7 @@ void RDCartSlot::loadData()
break;
case RDSlotOptions::BreakawayMode:
if(slot_svcs_dialog->exec(&slot_svcname)==0) {
if(slot_svcs_dialog->exec(&slot_svcname)) {
slot_box->setService(slot_svcname);
slot_box->setStatusLine(tr("Waiting for break..."));
}
@ -456,7 +456,7 @@ void RDCartSlot::loadData()
void RDCartSlot::optionsData()
{
RDSlotOptions::Mode old_mode=slot_options->mode();
if(slot_slot_dialog->exec(slot_options)==0) {
if(slot_slot_dialog->exec(slot_options)) {
if(old_mode!=slot_options->mode()) {
slot_box->clear();
}

9
lib/rdcueeditdialog.cpp
View File

@ -2,7 +2,7 @@
//
// A Dialog Box for using an RDCueEdit widget.
//
// (C) Copyright 2002-2020 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU Library General Public License
@ -18,9 +18,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <qapplication.h>
#include <qpushbutton.h>
#include "rdcueeditdialog.h"
RDCueEditDialog::RDCueEditDialog(RDCae *cae,int play_card,int play_port,
@ -98,11 +95,11 @@ void RDCueEditDialog::okData()
RDLogLine::LogPointer);
edit_logline->setPlayPositionChanged(true);
}
done(0);
done(true);
}
void RDCueEditDialog::cancelData()
{
done(-1);
done(false);
}

4
lib/rdlistsvcs.cpp
View File

@ -107,13 +107,13 @@ void RDListSvcs::okData()
}
*edit_svcname=edit_svc_model->serviceName(rows.first());
done(0);
done(true);
}
void RDListSvcs::cancelData()
{
done(-1);
done(false);
}

4
lib/rdslotdialog.cpp
View File

@ -145,13 +145,13 @@ void RDSlotDialog::okData()
edit_options->setHookMode(edit_hook_box->currentIndex());
edit_options->setStopAction((RDSlotOptions::StopAction)edit_stop_action_box->
currentIndex());
done(0);
done(true);
}
void RDSlotDialog::cancelData()
{
done(-1);
done(false);
}