Credit Andrew - fix vorbis audio which was scratchy and ensure aging plugin does...

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / videowindowgui.C

diff --git a/cinelerra-5.1/cinelerra/videowindowgui.C b/cinelerra-5.1/cinelerra/videowindowgui.C
index 252e57104644c7c08e3d3374080e8d21239ccb6d..e0022103bb1a2edfb158989f988b70a68a645abb 100644 (file)
--- a/cinelerra-5.1/cinelerra/videowindowgui.C
+++ b/cinelerra-5.1/cinelerra/videowindowgui.C
@@ -28,13 +28,13 @@
 
 
 
-#define CROPHANDLE_W 10
-#define CROPHANDLE_H 10
+#define CROPHANDLE_W xS(10)
+#define CROPHANDLE_H yS(10)
 
 VideoWindowGUI::VideoWindowGUI(VideoWindow *thread, int w, int h)
  : BC_Window(_(PROGRAM_NAME ": Video out"),
        (int)BC_INFINITY, (int)BC_INFINITY,
-       w, h, 10, 10, 1, 1, 1)
+       w, h, xS(10), yS(10), 1, 1, 1)
 {
        this->thread = thread;
 }
@@ -65,7 +65,7 @@ int VideoWindowGUI::resize_event(int w, int h)
 //     new_h = h;
 //     thread->get_full_sizes(full_w, full_h);
 //
-//     if(labs(full_w - new_w) < 50)
+//     if(labs(full_w - new_w) < xS(50))
 //     {
 //             new_w = full_w;
 //             new_h = full_h;
@@ -73,8 +73,8 @@ int VideoWindowGUI::resize_event(int w, int h)
 //     else
 //             thread->fix_size(new_w, new_h, w, thread->mwindow->get_aspect_ratio());
 //
-//     if(new_w < 10) new_w = 10;
-//     if(new_h < 10) new_h = 10;
+//     if(new_w < xS(10)) new_w = xS(10);
+//     if(new_h < yS(10)) new_h = yS(10);
 //     w = thread->video_window_w = new_w;
 //     h = new_h;
 //
@@ -105,6 +105,7 @@ int VideoWindowGUI::update_title()
 int VideoWindowGUI::close_event()
 {
        thread->hide_window();
+       return 0;
 }
 
 
@@ -153,6 +154,7 @@ int VideoWindowCanvas::button_press()
                        gui->y_offset = y - gui->y1;
                }
        }
+       return 0;
 }
 
 int VideoWindowCanvas::button_release()
@@ -162,6 +164,7 @@ int VideoWindowCanvas::button_release()
                button_down = 0;
                corner_selected = 0;
        }
+       return 0;
 }
 
 int VideoWindowCanvas::cursor_motion()
@@ -199,6 +202,7 @@ int VideoWindowCanvas::cursor_motion()
                draw_crop_box();
                flash();
        }
+       return 0;
 }
 
 int VideoWindowCanvas::draw_crop_box()
@@ -214,5 +218,6 @@ int VideoWindowCanvas::draw_crop_box()
        draw_box(gui->x2 - CROPHANDLE_W, gui->y1 + 1, CROPHANDLE_W, CROPHANDLE_H - 1);
        draw_rectangle(gui->x1, gui->y1, w, h);
        set_opaque();
+       return 0;
 }