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

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

Browse Source 
* Fixed regressions in rdairplay(1), rdcastmanager(1) and
	rdcatch(1) where configuration changes would not be updated properly.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-02-25 15:34:19 -05:00
parent a923e8953d
commit 33921a3781
7 changed files with 20 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -21228,3 +21228,6 @@
a panel would fail to be reflected in the panel selector.
* Fixed regressions in sound panels where configuration changes
would not be updated properly.
2021-02-25 Fred Gleason <fredg@paravelsystems.com>
* Fixed regressions in rdairplay(1), rdcastmanager(1) and
rdcatch(1) where configuration changes would not be updated properly.

22
lib/rddatedialog.cpp
View File

@ -2,7 +2,7 @@
//
// A Dialog Box for using an RDDatePicker widget.
//
// (C) Copyright 2002-2019 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,20 +18,10 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <qapplication.h>
#include <qwidget.h>
#include <qpushbutton.h>
#include <qrect.h>
#include <qpoint.h>
#include <qpainter.h>
#include <qstring.h>
#include <qmessagebox.h>
#include <qlineedit.h>
#include <qlabel.h>
#include <qsignalmapper.h>
#include <QPushButton>
#include <rdconf.h>
#include <rddatedialog.h>
#include "rdconf.h"
#include "rddatedialog.h"
//
// Global Classes
@ -93,11 +83,11 @@ int RDDateDialog::exec(QDate *date)
void RDDateDialog::okData()
{
*date_date=date_picker->date();
done(0);
done(true);
}
void RDDateDialog::cancelData()
{
done(-1);
done(false);
}

2
rdairplay/rdairplay.cpp
View File

@ -2206,7 +2206,7 @@ void MainWidget::SetActionMode(StartButton::Mode mode)
air_panel->setActionMode(RDAirPlayConf::Normal);
}
if(air_cart_dialog->
exec(&air_add_cart,RDCart::All,air_log[0]->serviceName(),NULL)==0) {
exec(&air_add_cart,RDCart::All,air_log[0]->serviceName(),NULL)) {
SetActionMode(StartButton::AddTo);
}
else {

2
rdcastmanager/edit_cast.cpp
View File

@ -313,7 +313,7 @@ void EditCast::expirationSelectData()
RDDateDialog *dd=
new RDDateDialog(1970,current_date.year()+10,this);
if(dd->exec(&date)==0) {
if(dd->exec(&date)) {
cast_item_expiration_edit->setDate(date);
}
delete dd;

16
rdcatch/edit_cartevent.cpp
View File

@ -287,15 +287,13 @@ void EditCartEvent::selectCartData()
if(edit_cart!=NULL) {
cartnum=edit_cart->number();
}
switch(catch_cart_dialog->exec(&cartnum,RDCart::Macro,QString(),NULL)) {
case 0:
if(edit_cart!=NULL) {
delete edit_cart;
}
edit_cart=new RDCart(cartnum);
edit_destination_edit->setText(QString().sprintf("%d",cartnum));
edit_description_edit->setText(edit_cart->title());
break;
if(catch_cart_dialog->exec(&cartnum,RDCart::Macro,QString(),NULL)) {
if(edit_cart!=NULL) {
delete edit_cart;
}
edit_cart=new RDCart(cartnum);
edit_destination_edit->setText(QString().sprintf("%d",cartnum));
edit_description_edit->setText(edit_cart->title());
}
}

2
rdcatch/edit_upload.cpp
View File

@ -81,7 +81,7 @@ EditUpload::EditUpload(int id,std::vector<int> *adds,QString *filter,
//
edit_station_box=new RDComboBox(this);
edit_station_box->setGeometry(200,10,140,23);
connect(edit_station_box,SIGNAL(textChanged(const QString &)),
connect(edit_station_box,SIGNAL(editTextChanged(const QString &)),
this,SLOT(stationChangedData(const QString &)));
label=new QLabel(tr("Location:"),this);
label->setGeometry(125,10,70,23);

2
rdcatch/rdcatch.cpp
View File

@ -307,7 +307,7 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent)
// Cart Picker
//
catch_cart_dialog=new RDCartDialog(&catch_filter,&catch_group,
&catch_schedcode,"RDCatch",false,this);
&catch_schedcode,"RDCatch",false,this);
//
// Cart List