rework android-rmt display, add a few buttons

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

diff --git a/cinelerra-5.0/cinelerra/vwindowgui.C b/cinelerra-5.0/cinelerra/vwindowgui.C
index 8fe9f99b27da9feb5239057d6a2eaae31fb88964..3c9ad5e62ef02fb6834e0fdae5044303dc4ce4ef 100644 (file)
--- a/cinelerra-5.0/cinelerra/vwindowgui.C
+++ b/cinelerra-5.0/cinelerra/vwindowgui.C
@@ -57,7 +57,7 @@
 
 
 VWindowGUI::VWindowGUI(MWindow *mwindow, VWindow *vwindow)
- : BC_Window(PROGRAM_NAME ": Viewer",
+ : BC_Window(_(PROGRAM_NAME ": Viewer"),
        mwindow->session->vwindow_x,
        mwindow->session->vwindow_y,
        mwindow->session->vwindow_w,
@@ -79,6 +79,7 @@ VWindowGUI::VWindowGUI(MWindow *mwindow, VWindow *vwindow)
 
 VWindowGUI::~VWindowGUI()
 {
+       vwindow->playback_engine->interrupt_playback(1);
        sources.remove_all_objects();
        labels.remove_all_objects();
        delete canvas;
@@ -96,9 +97,9 @@ void VWindowGUI::change_source(EDL *edl, const char *title)
        char string[BCTEXTLEN];
 
        if(title[0]) 
-               sprintf(string, PROGRAM_NAME ": %s", title);
+               sprintf(string, _(PROGRAM_NAME ": %s"), title);
        else
-               sprintf(string, PROGRAM_NAME ": Viewer");
+               sprintf(string, _(PROGRAM_NAME ": Viewer"));
 
        lock_window("VWindowGUI::change_source");
        timebar->update(0);
@@ -405,13 +406,8 @@ void VWindowGUI::drag_motion()
                cursor_y < canvas->y + canvas->h);
 
 
-printf("VWindowGUI::drag_motion 1 %d %d %d %d %d\n", 
-__LINE__, 
-mwindow->session->vcanvas_highlighted,
-get_cursor_over_window(),
-cursor_x,
-cursor_y);
-
+//printf("VWindowGUI::drag_motion 1 %d %d %d %d %d\n", __LINE__, 
+// mwindow->session->vcanvas_highlighted, get_cursor_over_window(), cursor_x, cursor_y);
 
        if(old_status != mwindow->session->vcanvas_highlighted)
                canvas->draw_refresh();
@@ -810,6 +806,9 @@ void VWindowCanvas::zoom_resize_window(float percentage)
 
 void VWindowCanvas::close_source()
 {
+       gui->unlock_window();
+       gui->vwindow->playback_engine->interrupt_playback(1);
+       gui->lock_window("VWindowCanvas::close_source");
        gui->vwindow->delete_source(1, 1);
 }