diff --git a/rdairplay/edit_event.cpp b/rdairplay/edit_event.cpp
index 3ac3dc7d..0e212146 100644
--- a/rdairplay/edit_event.cpp
+++ b/rdairplay/edit_event.cpp
@@ -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
diff --git a/rdairplay/log_play.cpp b/rdairplay/log_play.cpp
index 2db58761..eeb25369 100644
--- a/rdairplay/log_play.cpp
+++ b/rdairplay/log_play.cpp
@@ -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()),