Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-11-26 15:20:29 +01:00
Code Issues Projects Releases Wiki Activity

2021-07-03 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Modified the buttons in the Button Log widget in rdairplay(1) to
	display channel labels when playing.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-07-03 12:36:17 -04:00
parent 21d35faa50
commit aa5238acf2
7 changed files with 42 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/rdlogplay.cpp
View File

@@ -239,12 +239,13 @@ void RDLogPlay::setLogName(QString name)
}
void RDLogPlay::setChannels(int cards[2],int ports[2],
void RDLogPlay::setChannels(int cards[2],int ports[2],QString labels[2],
const QString start_rml[2],const QString stop_rml[2])
{
for(int i=0;i<2;i++) {
play_card[i]=cards[i];
play_port[i]=ports[i];
play_label[i]=labels[i];
play_start_rml[i]=start_rml[i];
play_stop_rml[i]=stop_rml[i];
play_cae->requestTimescale(play_card[i]);
@@ -2633,10 +2634,11 @@ QString RDLogPlay::GetPortName(int card,int port)
for(int i=0;i<2;i++) {
for(int j=0;j<2;j++) {
if((play_card[i]==card)&&(play_port[i]==port)) {
return QString().sprintf("%d",i+1);
return play_label[i];
}
}
}
return QString();
}

3
lib/rdlogplay.h
View File

@@ -61,7 +61,7 @@ class RDLogPlay : public RDLogModel
RDAirPlayConf::OpMode mode() const;
void setOpMode(RDAirPlayConf::OpMode mode);
void setLogName(QString name);
void setChannels(int cards[2],int ports[2],
void setChannels(int cards[2],int ports[2],QString labels[2],
const QString start_rml[2],const QString stop_rml[2]);
void setSegueLength(int len);
void setNowCart(unsigned cartnum);
@@ -228,6 +228,7 @@ class RDLogPlay : public RDLogModel
int play_grace_line;
int play_card[2];
int play_port[2];
QString play_label[2];
QString play_start_rml[2];
QString play_stop_rml[2];
bool play_timescaling_available;