diff --git a/livesupport/bin/user_setup.sh b/livesupport/bin/user_setup.sh
index e11dc6328..dfef4eb14 100755
--- a/livesupport/bin/user_setup.sh
+++ b/livesupport/bin/user_setup.sh
@@ -22,7 +22,7 @@
 #
 #
 #   Author   : $Author: maroy $
-#   Version  : $Revision: 1.5 $
+#   Version  : $Revision: 1.6 $
 #   Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/user_setup.sh,v $
 #-------------------------------------------------------------------------------                                                                                
 #-------------------------------------------------------------------------------
@@ -108,7 +108,7 @@ dbpassword=test
 homedir=$HOME
 configdir=$homedir/.livesupport
 htmldir=$homedir/public_html
-outputdsp=/dev/dsp
+output_device=plughw:0,0
 
 
 
@@ -127,7 +127,7 @@ echo "  apache daemon group:     $apache_group";
 echo "  home directory:          $homedir";
 echo "  configuration directory: $configdir";
 echo "  web base directory:      $htmldir";
-echo "  output audio device:     $outputdsp";
+echo "  output audio device:     $output_device";
 echo ""
 
 
@@ -167,7 +167,7 @@ ls_scheduler_port=$scheduler_port
 ls_scheduler_urlPrefix=
 ls_scheduler_xmlRpcPrefix=RC2
 
-ls_output_dsp=$outputdsp
+ls_output_alsa_device=$output_device
 
 
 # replace / characters with a \/ sequence, for sed below
@@ -182,7 +182,6 @@ ls_scheduler_urlPrefix_s=`echo $ls_scheduler_urlPrefix | \
                                 sed -e "s/\//\\\\\\\\\//g"`
 ls_scheduler_xmlRpcPrefix_s=`echo $ls_scheduler_xmlRpcPrefix | \
                                 sed -e "s/\//\\\\\\\\\//g"`
-ls_output_dsp_s=`echo $ls_output_dsp | sed -e "s/\//\\\\\\\\\//g"`
 
 replace_sed_string="s/ls_install_dir/$installdir_s/; \
               s/ls_dbuser/$ls_dbuser/; \
@@ -200,7 +199,7 @@ replace_sed_string="s/ls_install_dir/$installdir_s/; \
               s/ls_scheduler_xmlRpcPrefix/$ls_scheduler_xmlRpcPrefix_s/; \
               s/ls_scheduler_host/$ls_scheduler_host/; \
               s/ls_scheduler_port/$ls_scheduler_port/; \
-              s/ls_output_dsp/$ls_output_dsp_s/;"
+              s/ls_output_alsa_device/$ls_output_alsa_device/;"
 
 
 
diff --git a/livesupport/products/scheduler/etc/Makefile.in b/livesupport/products/scheduler/etc/Makefile.in
index d8d79de8a..be873e954 100644
--- a/livesupport/products/scheduler/etc/Makefile.in
+++ b/livesupport/products/scheduler/etc/Makefile.in
@@ -21,7 +21,7 @@
 #
 #
 #   Author   : $Author: maroy $
-#   Version  : $Revision: 1.60 $
+#   Version  : $Revision: 1.61 $
 #   Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/etc/Makefile.in,v $
 #
 #   @configure_input@
@@ -232,7 +232,7 @@ SCHEDULER_EXE_LIBS = -l${EVENT_SCHEDULER_LIB} -l${PLAYLIST_EXECUTOR_LIB} \
 
 TEST_RUNNER_OBJS = ${SCHEDULER_OBJS} \
                    ${TMP_DIR}/TestRunner.o \
-				   ${TMP_DIR}/BaseTestMethod.o \
+                   ${TMP_DIR}/BaseTestMethod.o \
                    ${TMP_DIR}/ResetStorageMethodTest.o \
                    ${TMP_DIR}/SchedulerDaemonTest.o \
                    ${TMP_DIR}/GetSchedulerTimeMethodTest.o \
diff --git a/livesupport/products/scheduler/etc/scheduler-local.xml b/livesupport/products/scheduler/etc/scheduler-local.xml
index 97450cb6b..89bd8c102 100644
--- a/livesupport/products/scheduler/etc/scheduler-local.xml
+++ b/livesupport/products/scheduler/etc/scheduler-local.xml
@@ -63,11 +63,14 @@
 <!ELEMENT playLogFactory (postgresqlPlayLog) >
 <!ELEMENT postgresqlPlayLog EMPTY >
 
-<!ELEMENT audioPlayer   (helixPlayer) >
+<!ELEMENT audioPlayer   (helixPlayer|gstreamerPlayer) >
 
 <!ELEMENT helixPlayer   EMPTY >
 <!ATTLIST helixPlayer   dllPath     CDATA   #REQUIRED >
 
+<!ELEMENT gstreamerPlayer   EMPTY >
+<!ATTLIST gstreamerPlayer   audioDevice  CDATA   #IMPLIED  >
+
 <!ELEMENT xmlRpcDaemon EMPTY >
 <!ATTLIST xmlRpcDaemon xmlRpcHost   CDATA          #REQUIRED >
 <!ATTLIST xmlRpcDaemon xmlRpcPort   NMTOKEN        #REQUIRED >
@@ -126,7 +129,7 @@
     </playLogFactory>
 
     <audioPlayer>
-        <helixPlayer dllPath = "../../usr/lib/helix"/>
+        <gstreamerPlayer audioDevice = "plughw:0,0" />
     </audioPlayer>
 
     <xmlRpcDaemon xmlRpcHost  = "localhost"
diff --git a/livesupport/products/scheduler/etc/scheduler.xml b/livesupport/products/scheduler/etc/scheduler.xml
index 83cf732cf..8ce1d92ed 100644
--- a/livesupport/products/scheduler/etc/scheduler.xml
+++ b/livesupport/products/scheduler/etc/scheduler.xml
@@ -66,7 +66,7 @@
 <!ELEMENT playLogFactory (postgresqlPlayLog) >
 <!ELEMENT postgresqlPlayLog EMPTY >
 
-<!ELEMENT audioPlayer   (helixPlayer) >
+<!ELEMENT audioPlayer   (helixPlayer|gstreamerPlayer) >
 
 <!ELEMENT helixPlayer   EMPTY >
 <!ATTLIST helixPlayer   dllPath     CDATA   #REQUIRED >
@@ -74,6 +74,9 @@
 <!ATTLIST helixPlayer   audioStreamTimeout   NMTOKEN   #IMPLIED >
 <!ATTLIST helixPlayer   fadeLookAheatTime    NMTOKEN   #IMPLIED >
 
+<!ELEMENT gstreamerPlayer   EMPTY >
+<!ATTLIST gstreamerPlayer   audioDevice  CDATA   #IMPLIED  >
+
 <!ELEMENT xmlRpcDaemon EMPTY >
 <!ATTLIST xmlRpcDaemon xmlRpcHost   CDATA          #REQUIRED >
 <!ATTLIST xmlRpcDaemon xmlRpcPort   NMTOKEN        #REQUIRED >
@@ -114,7 +117,7 @@
     </playLogFactory>
 
     <audioPlayer>
-        <helixPlayer dllPath = "../../usr/lib/helix"/>
+        <gstreamerPlayer audioDevice = "plughw:0,0" />
     </audioPlayer>
 
     <xmlRpcDaemon xmlRpcHost  = "localhost"
diff --git a/livesupport/products/scheduler/etc/scheduler.xml.template b/livesupport/products/scheduler/etc/scheduler.xml.template
index c837b6700..59bb8fac7 100644
--- a/livesupport/products/scheduler/etc/scheduler.xml.template
+++ b/livesupport/products/scheduler/etc/scheduler.xml.template
@@ -66,7 +66,7 @@
 <!ELEMENT playLogFactory (postgresqlPlayLog) >
 <!ELEMENT postgresqlPlayLog EMPTY >
 
-<!ELEMENT audioPlayer   (helixPlayer) >
+<!ELEMENT audioPlayer   (helixPlayer|gstreamerPlayer) >
 
 <!ELEMENT helixPlayer   EMPTY >
 <!ATTLIST helixPlayer   dllPath     CDATA   #REQUIRED >
@@ -74,6 +74,9 @@
 <!ATTLIST helixPlayer   audioStreamTimeout   NMTOKEN   #IMPLIED >
 <!ATTLIST helixPlayer   fadeLookAheatTime    NMTOKEN   #IMPLIED >
 
+<!ELEMENT gstreamerPlayer   EMPTY >
+<!ATTLIST gstreamerPlayer   audioDevice  CDATA   #IMPLIED  >
+
 <!ELEMENT xmlRpcDaemon EMPTY >
 <!ATTLIST xmlRpcDaemon xmlRpcHost   CDATA          #REQUIRED >
 <!ATTLIST xmlRpcDaemon xmlRpcPort   NMTOKEN        #REQUIRED >
@@ -114,9 +117,7 @@
     </playLogFactory>
 
     <audioPlayer>
-        <helixPlayer dllPath = "ls_install_dir/lib/helix"
-                     audioDevice = "ls_output_dsp"
-		/>
+        <gstreamerPlayer audioDevice = "ls_output_alsa_device" />
     </audioPlayer>
 
     <xmlRpcDaemon xmlRpcHost  = "ls_scheduler_host"
diff --git a/livesupport/products/scheduler/src/PlaylistEventTest.h b/livesupport/products/scheduler/src/PlaylistEventTest.h
index 248639bd1..d011d6471 100644
--- a/livesupport/products/scheduler/src/PlaylistEventTest.h
+++ b/livesupport/products/scheduler/src/PlaylistEventTest.h
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: maroy $
-    Version  : $Revision: 1.6 $
+    Version  : $Revision: 1.7 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/PlaylistEventTest.h,v $
 
 ------------------------------------------------------------------------------*/
@@ -71,15 +71,15 @@ using namespace LiveSupport::PlaylistExecutor;
  *  Unit test for the PlaylistEvent class
  *
  *  @author  $Author: maroy $
- *  @version $Revision: 1.6 $
+ *  @version $Revision: 1.7 $
  *  @see PlaylistEvent
  */
 class PlaylistEventTest : public CPPUNIT_NS::TestFixture
 {
     CPPUNIT_TEST_SUITE(PlaylistEventTest);
     CPPUNIT_TEST(simpleTest);
-//    CPPUNIT_TEST(initializeTest);
-//    CPPUNIT_TEST(playTest);
+    CPPUNIT_TEST(initializeTest);
+    CPPUNIT_TEST(playTest);
     CPPUNIT_TEST_SUITE_END();
 
     private: