LibreMediaServer/lms-video
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- removed some git garbage from previous conflict

Browse source
This commit is contained in:
Santi Noreña 2013-04-23 20:10:08 +02:00
parent 1ceaa574a5
commit a50dcb5853
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libremediaserver.cpp
View file

@ -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;