prevent popup deactivation while button_down

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

diff --git a/cinelerra-5.0/cinelerra/render.C b/cinelerra-5.0/cinelerra/render.C
index b772d5300df678a0704ff00bec39369677e62c3e..53adbf90918f51f8558ac08417667f25d7e724e4 100644 (file)
--- a/cinelerra-5.0/cinelerra/render.C
+++ b/cinelerra-5.0/cinelerra/render.C
@@ -63,7 +63,6 @@
 #include "playabletracks.h"
 #include "preferences.h"
 #include "preferencesthread.h"
-#include "quicktime.h"
 #include "renderfarm.h"
 #include "render.h"
 #include "statusbar.h"
@@ -82,7 +81,7 @@
 
 
 RenderItem::RenderItem(MWindow *mwindow)
- : BC_MenuItem(_("Render..."), "Shift+R", 'R')
+ : BC_MenuItem(_("Render..."), _("Shift+R"), 'R')
 {
        this->mwindow = mwindow;
        set_shift(1);
@@ -216,7 +215,7 @@ void MainPackageRenderer::set_progress(int64_t value)
                                eta,
                                TIME_HMS2);
 
-                       printf("\r%d%% ETA: %s      ", (int)(100 * 
+                       printf(_("\r%d%% ETA: %s      "), (int)(100 * 
                                (float)render->total_rendered / 
                                        render->progress_max),
                                string);
@@ -267,6 +266,7 @@ Render::Render(MWindow *mwindow)
 
 Render::~Render()
 {
+       close_window();
        delete package_lock;
        delete counter_lock;
        delete completion;
@@ -287,10 +287,10 @@ void Render::start_interactive()
        }
        else
        {
-               ErrorBox error_box(PROGRAM_NAME ": Error",
+               ErrorBox error_box(_(PROGRAM_NAME ": Error"),
                        mwindow->gui->get_abs_cursor_x(1),
                        mwindow->gui->get_abs_cursor_y(1));
-               error_box.create_objects("Already rendering");
+               error_box.create_objects(_("Already rendering"));
                error_box.raise_window();
                error_box.run_window();
        }
@@ -374,12 +374,12 @@ void Render::handle_close_event(int result)
                if(debug) printf("Render::handle_close_event %d\n", __LINE__);
        }
 
-PRINT_TRACE
+//PRINT_TRACE
 
        save_defaults(asset);
-PRINT_TRACE
+//PRINT_TRACE
        mwindow->save_defaults();
-PRINT_TRACE
+//PRINT_TRACE
 
        if(!format_error && !result)
        {
@@ -387,7 +387,7 @@ PRINT_TRACE
                if(!result) start_render();
                if(debug) printf("Render::handle_close_event %d\n", __LINE__);
        }
-PRINT_TRACE
+//PRINT_TRACE
 }
 
 
@@ -429,7 +429,6 @@ int Render::check_asset(EDL *edl, Asset &asset)
        {
                asset.audio_data = 1;
                asset.channels = edl->session->audio_channels;
-               if(asset.format == FILE_MOV) asset.byte_order = 0;
        }
        else
        {
@@ -609,15 +608,15 @@ int Render::load_defaults(Asset *asset)
        strategy = mwindow->defaults->get("RENDER_STRATEGY", SINGLE_PASS);
        load_mode = mwindow->defaults->get("RENDER_LOADMODE", LOADMODE_NEW_TRACKS);
 
+// some defaults which work
+       asset->video_data = 1;
+       asset->audio_data = 1;
+       asset->format = FILE_FFMPEG;
+       strcpy(asset->acodec, "mp4.qt");
+       strcpy(asset->vcodec, "mp4.qt");
 
        asset->load_defaults(mwindow->defaults, 
-               "RENDER_", 
-               1,
-               1,
-               1,
-               1,
-               1);
-
+               "RENDER_", 1, 1, 1, 1, 1);
 
        return 0;
 }
@@ -898,7 +897,7 @@ if(debug) printf("Render::render %d\n", __LINE__);
                        if(mwindow)
                        {
 if(debug) printf("Render::render %d\n", __LINE__);
-                               ErrorBox error_box(PROGRAM_NAME ": Error",
+                               ErrorBox error_box(_(PROGRAM_NAME ": Error"),
                                        mwindow->gui->get_abs_cursor_x(1),
                                        mwindow->gui->get_abs_cursor_y(1));
                                error_box.create_objects(_("Error rendering data."));
@@ -1114,7 +1113,7 @@ RenderWindow::RenderWindow(MWindow *mwindow,
        Asset *asset,
        int x, 
        int y)
- : BC_Window(PROGRAM_NAME ": Render", 
+ : BC_Window(_(PROGRAM_NAME ": Render"), 
        x - WIDTH / 2,
        y - HEIGHT / 2,
        WIDTH,