Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-11 17:13:47 +02:00
Code Issues Projects Releases Wiki Activity

Merged 04bd883b65 from master

Browse Source
This commit is contained in:
Fred Gleason
2015-09-15 08:06:20 -04:00
parent 6936746e34 04bd883b65
commit c0446ea5f7
103 changed files with 1645 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rdairplay/log_play.cpp
View File

@@ -1460,9 +1460,9 @@ void LogPlay::graceTimerData()
void LogPlay::playStateChangedData(int id,RDPlayDeck::State state)
{
//#ifdef SHOW_SLOTS
#ifdef SHOW_SLOTS
printf("playStateChangedData(%d,%d), log: %s\n",id,state,(const char *)logName());
//#endif
#endif
switch(state) {
case RDPlayDeck::Playing:
Playing(id);
@@ -1857,11 +1857,11 @@ bool LogPlay::StartEvent(int line,RDLogLine::TransType trans_type,
rdevent_player->
exec(logline->resolveWildcards(play_start_rml[aport]));
}
/*
printf("channelStarted(%d,%d,%d,%d)\n",
play_id,playdeck->channel(),
playdeck->card(),playdeck->port());
*/
emit channelStarted(play_id,playdeck->channel(),
playdeck->card(),playdeck->port());
LogLine(RDConfig::LogInfo,QString().sprintf(
@@ -2772,12 +2772,12 @@ void LogPlay::ClearChannel(int deckid)
if(play_deck[deckid]->channel()>=0) {
rdevent_player->exec(play_stop_rml[play_deck[deckid]->channel()]);
/*
printf("Deck: %d channelStopped(%d,%d,%d,%d\n",deckid,
play_id,play_deck[deckid]->channel(),
play_deck[deckid]->card(),
play_deck[deckid]->port());
*/
emit channelStopped(play_id,play_deck[deckid]->channel(),
play_deck[deckid]->card(),
play_deck[deckid]->port());