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

Fixed conflict in 'ChangeLog'

Browse Source
This commit is contained in:
Fred Gleason 2018-11-26 09:33:36 -05:00
commit 08a45595b8
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -18058,3 +18058,5 @@
2018-11-23 Patrick Linstruth <patrick@deltecent.com>
* Fixed regression where remote log changes did not auto refresh
in rdairplay(1).
2018-11-24 Patrick Linstruth <patrick@deltecent.com>
* Fixed regression with rdairplay(1) loading previous log.

6
lib/rdlogplay.cpp
View File

@ -222,16 +222,16 @@ void RDLogPlay::setOpMode(RDAirPlayConf::OpMode mode)
UpdateStartTimes(play_line_counter);
}
/*
void RDLogPlay::setLogName(QString name)
{
if(logName()!=name) {
RDLogEvent::setLogName(name);
emit renamed();
rda->airplayConf()->setCurrentLog(play_id,name.left(name.length()-4));
rda->airplayConf()->setCurrentLog(play_id,name);
}
}
*/
void RDLogPlay::setChannels(int cards[2],int ports[2],
const QString start_rml[2],const QString stop_rml[2])

2
lib/rdlogplay.h
View File

@ -64,7 +64,7 @@ class RDLogPlay : public QObject,public RDLogEvent
bool channelsValid() const;
RDAirPlayConf::OpMode mode() const;
void setOpMode(RDAirPlayConf::OpMode mode);
// void setLogName(QString name);
void setLogName(QString name);
void setChannels(int cards[2],int ports[2],
const QString start_rml[2],const QString stop_rml[2]);
void setSegueLength(int len);