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

Merge pull request #24 from tryphon/station-cue

Browse Source 
Use Station cue card and port
Merged to master.  Thanks!
This commit is contained in:
Fred Gleason 2014-09-20 15:59:57 -04:00
commit ea15b7f4e7
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rdairplay/edit_event.cpp
View File

@ -135,8 +135,8 @@ EditEvent::EditEvent(LogPlay *log,QWidget *parent,const char *name)
// Cue Editor
//
edit_cue_edit=
new RDCueEdit(rdcae,rdairplay_conf->card(RDAirPlayConf::CueChannel),
rdairplay_conf->port(RDAirPlayConf::CueChannel),this);
new RDCueEdit(rdcae,rdstation_conf->cueCard(),
rdstation_conf->cuePort(),this);
//
// Cart Notes

8
rdairplay/log_play.cpp
View File

@ -109,12 +109,10 @@ LogPlay::LogPlay(RDCae *cae,int id,QSocketDevice *nn_sock,QString logname,
// Audition Player
//
play_audition_line=-1;
if((rdairplay_conf->card(RDAirPlayConf::CueChannel)>=0)&&
(rdairplay_conf->port(RDAirPlayConf::CueChannel)>=0)) {
if((rdstation_conf->cueCard()>=0)&&
(rdstation_conf->cuePort()>=0)) {
play_audition_player=new RDSimplePlayer(rdcae,rdripc,
rdairplay_conf->card(RDAirPlayConf::CueChannel),
rdairplay_conf->port(RDAirPlayConf::CueChannel),
0,0);
rdstation_conf->cueCard(),rdstation_conf->cuePort(),0,0);
play_audition_player->playButton()->hide();
play_audition_player->stopButton()->hide();
connect(play_audition_player,SIGNAL(played()),