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