--- src/cmd/music.cpp.orig 2011-07-09 09:26:05.996489559 -0500
+++ src/cmd/music.cpp 2011-07-09 09:30:12.671840700 -0500
@@ -123,9 +123,7 @@
if ( g_game.music_enabled && !soundServerPipes() ) {
int pid = fork();
if (!pid) {
- string soundserver_path = VSFileSystem::datadir+"/bin/soundserver";
- pid = execlp( soundserver_path.c_str(), soundserver_path.c_str(), NULL );
- soundserver_path = VSFileSystem::datadir+"/soundserver";
+ string soundserver_path = "/usr/libexec/vegastrike/soundserver";
pid = execlp( soundserver_path.c_str(), soundserver_path.c_str(), NULL );
g_game.music_enabled = false;
VSFileSystem::vs_fprintf( stderr, "Unable to spawn music player server\n" );
@@ -190,20 +188,9 @@
}
#else
if (g_game.music_enabled) {
- std::string tmp = VSFileSystem::datadir+"/bin/soundserver";
- FILE *fp = fopen( tmp.c_str(), "rb" );
- if (!fp) {
- tmp = VSFileSystem::datadir+"/soundserver";
- fp = fopen( tmp.c_str(), "rb" );
- if (!fp) {
- g_game.music_enabled = false;
- socketw = -1;
- socketr = -1;
- } else {fclose( fp ); }} else {fclose( fp ); }}
- if (g_game.music_enabled) {
int pid = fork();
if (!pid) {
- string soundserver_path = VSFileSystem::datadir+"/bin/soundserver";
+ string soundserver_path = "/usr/libexec/vegastrike/soundserver";
pid = execlp( soundserver_path.c_str(), soundserver_path.c_str(), buffer1, buffer2, NULL );
soundserver_path = VSFileSystem::datadir+"/soundserver";
pid = execlp( soundserver_path.c_str(), soundserver_path.c_str(), buffer1, buffer2, NULL );
--- src/gfx/mesh_xml.cpp.orig 2011-07-09 09:31:44.524514702 -0500
+++ src/gfx/mesh_xml.cpp 2011-07-09 09:32:32.354593661 -0500
@@ -1132,7 +1132,7 @@
#ifndef _WIN32
int pid = fork();
if (!pid) {
- string soundserver_path = VSFileSystem::datadir+"/bin/mesher";
+ string soundserver_path = "/usr/libexec/vegastrike/mesher";
string firstarg = string( "\"" )+soundserver_path+string( "\"" );
pid = execlp( soundserver_path.c_str(), soundserver_path.c_str(), input, output, args, NULL );
soundserver_path = VSFileSystem::datadir+"/mesher";