rework android-rmt display, add a few buttons

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

diff --git a/cinelerra-5.0/cinelerra/filescene.C b/cinelerra-5.0/cinelerra/filescene.C
index ddd8fee17b34686614251445238cb1b85867d7e6..ace2c080bf03f3ea9dd55f0efa1a5e9963b8890d 100644 (file)
--- a/cinelerra-5.0/cinelerra/filescene.C
+++ b/cinelerra-5.0/cinelerra/filescene.C
@@ -22,6 +22,7 @@
 
 #include "asset.h"
 #include "bcsignals.h"
+#include "clip.h"
 #include "file.h"
 #include "filescene.h"
 #include "filesystem.h"
@@ -43,8 +44,6 @@ extern "C"
 }
 
 
-extern void get_exe_path(char *result);
-
 // Paths relative to the exe path
 #define FESTIVAL_PATH "/festival"
 #define FESTIVAL_LIB_PATH "/lib/"
@@ -1854,11 +1853,11 @@ VFrame* SceneTokens::load_image(char *path)
        data[1] = (size >> 16) & 0xff;
        data[2] = (size >> 8) & 0xff;
        data[3] = size & 0xff;
-       result = new VFrame(data);
+       result = new VFramePng(data, 1.);
        delete [] data;
 
 
-       if(!cmodel_has_alpha(result->get_color_model()) )
+       if(!BC_CModels::has_alpha(result->get_color_model()) )
                printf("SceneTokens::load_image %d: image %s has no alpha channel\n", 
                        __LINE__,
                        path);