X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fscripting%2Fscript-impl.cpp;h=9cc0d245a52035e4705bddd376cb53d897e38749;hb=ae44254100eb934f5f766c9ac834261b379afed3;hp=8b08f992925b8e05801b61c4c25a7dce1043e7b0;hpb=928136dbb9e23970f3894eabc7c8b224003b77be;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/scripting/script-impl.cpp b/dali-toolkit/internal/scripting/script-impl.cpp index 8b08f99..9cc0d24 100644 --- a/dali-toolkit/internal/scripting/script-impl.cpp +++ b/dali-toolkit/internal/scripting/script-impl.cpp @@ -36,25 +36,11 @@ namespace const char* PLUGIN_FILE = "libdali-script-plugin-v8.so"; } -void Script::ExecuteFile( const std::string& filename ) -{ - if( mPlugin ) - { - mPlugin->ExecuteFile(filename); - } -} - -Script::Script(void) : mPlugin(NULL) +Script::Script() +: mPlugin( NULL ) { ScriptPluginProxy *plugin = new ScriptPluginProxy( PLUGIN_FILE ); - if( mPlugin ) - { - DALI_LOG_WARNING("Reloading script plugin %s, is this what you wanted to do?",PLUGIN_FILE); - delete mPlugin; - mPlugin = NULL; - } - if( plugin->IsInitialized() ) { mPlugin = plugin; @@ -63,7 +49,15 @@ Script::Script(void) : mPlugin(NULL) { delete plugin; } +} +bool Script::ExecuteFile( const std::string& filename ) +{ + if( mPlugin ) + { + return mPlugin->ExecuteFile(filename); + } + return false; } Script::~Script()