From a50dcb5853a1f648ebb21a1043ad237873ae4f43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santi=20Nore=C3=B1a?= Date: Tue, 23 Apr 2013 20:10:08 +0200 Subject: [PATCH] - removed some git garbage from previous conflict --- src/libremediaserver.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/libremediaserver.cpp b/src/libremediaserver.cpp index b8608f3..6d86e75 100644 --- a/src/libremediaserver.cpp +++ b/src/libremediaserver.cpp @@ -1410,11 +1410,7 @@ void libreMediaServer::pdstart_audio() } // Arrancamos el proceso Pure Data QString arguments; -<<<<<<< HEAD - arguments.append("./pd -alsa -channels 2 -audiodev 1 -stderr -nostdpath -path ./externals/ -open ./patches/lms-audio.pd "); -======= arguments.append("./puredata/pd -alsa -channels 2 -audiodev 1 -stderr -nostdpath -path ./puredata/externals/ -open ./puredata/lms-audio.pd "); ->>>>>>> v0.04 if (!m_gui) arguments.append("-nogui"); qDebug() << "PD Audio starts with argument: " << arguments;