improve resize flash operation, fixup xv grab/ungrab, fixup label updates

[goodguy/history.git] / cinelerra-5.1 / cinelerra / filescene.C

diff --git a/cinelerra-5.1/cinelerra/filescene.C b/cinelerra-5.1/cinelerra/filescene.C
index 548e6798154531638324c55b654b5bab0cd3e2c7..9166b80bdc7d20e2ba10005142c0ed68a29a0299 100644 (file)
--- a/cinelerra-5.1/cinelerra/filescene.C
+++ b/cinelerra-5.1/cinelerra/filescene.C
@@ -44,8 +44,10 @@ extern "C"
 
 
 // Paths relative to the exe path
+#ifdef HAVE_FESTIVAL_BUILTIN
 #define FESTIVAL_PATH "/festival"
 #define FESTIVAL_LIB_PATH "/lib/"
+#endif
 #define ASSET_PATH "/models/"
 #define FREAD_SIZE 0x10000
 #define WAVHEADER 44
@@ -198,7 +200,7 @@ FileScene::FileScene(Asset *asset, File *file)
  : FileBase(asset, file)
 {
        reset_parameters();
-       get_exe_path(exe_path);
+       strncpy(exec_path, File::get_cinlib_path(), sizeof(exec_path));
 }
 
 
@@ -1299,12 +1301,14 @@ void SceneChunk::render()
                uuid_unparse(temp_id, script_path + strlen(script_path));
                FILE *script_fd = fopen(script_path, "w");
 
+#ifdef HAVE_FESTIVAL_BUILTIN
                sprintf(command_line, "%s%s --libdir %s%s -b %s", 
-                       script->file->exe_path,
-                       FESTIVAL_PATH,
-                       script->file->exe_path,
-                       FESTIVAL_LIB_PATH,
+                       script->file->exec_path, FESTIVAL_PATH,
+                       script->file->exec_path, FESTIVAL_LIB_PATH,
                        script_path);
+#else
+               sprintf(command_line, "festival -b %s", script_path);
+#endif
 
 // Create script.
 // The maximum text length is limited with the command line
@@ -1822,7 +1826,7 @@ void SceneTokens::convert_path(char *dst, char *src)
                if(stat(dst, &ostat))
                {
 // Try cinelerra directory
-                       get_exe_path(dst);
+                       strcpy(dst, File::get_cindat_path());
                        strcat(dst, ASSET_PATH);
                        strcat(dst, src);
 //printf("SceneTokens::convert_path %d %s\n", __LINE__, dst);