wintv remote control + kernel patch, add codec fileref, amp up OpenEDL, add loadmode...

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

diff --git a/cinelerra-5.1/cinelerra/remotecontrol.C b/cinelerra-5.1/cinelerra/remotecontrol.C
index 1fa93d9c215b5658565ddc1401ad17729fd43d29..de2bc271323c317ce7dd2742687bedca6de0e190 100644 (file)
--- a/cinelerra-5.1/cinelerra/remotecontrol.C
+++ b/cinelerra-5.1/cinelerra/remotecontrol.C
@@ -9,7 +9,7 @@
 
 RemoteWindow::RemoteWindow(RemoteControl *remote_control)
  : BC_Window(_(PROGRAM_NAME ": RemoteWindow"),
-               0, 0, 16, 16, -1, -1, 1, 0, 1)
+               0, 0, xS(16), yS(16), -1, -1, 1, 0, 1)
 {
        this->remote_control = remote_control;
 }
@@ -58,9 +58,11 @@ int RemoteControl::activate(RemoteHandler *handler)
                if( !handler ) handler = !mwindow_gui->record->running() ?
                        (RemoteHandler *)mwindow_gui->cwindow_remote_handler :
                        (RemoteHandler *)mwindow_gui->record_remote_handler ;
+               gui->lock_window("RemoteControl::activate");
                gui->set_active(handler);
                gui->set_color(handler->color);
                gui->fill_color(handler->color);
+               gui->unlock_window();
                result = 1;
        }
        active_lock->unlock();
@@ -82,7 +84,7 @@ int RemoteControl::deactivate()
 int RemoteControl::remote_key(int key)
 {
        if( !is_active() ) return 0;
-       return handler->remote_process_key(this, key);
+       return handler->process_key(key);
 }
 
 void RemoteControl::set_color(int color)
@@ -100,7 +102,8 @@ void RemoteControl::fill_color(int color)
 }
 
 RemoteGUI::RemoteGUI(BC_WindowBase *wdw, RemoteControl *remote_control)
- : BC_Popup(wdw, remote_control->mwindow_gui->mwindow->session->mwindow_x,0,16,16, -1, 1)
+ : BC_Popup(wdw, remote_control->mwindow_gui->mwindow->session->mwindow_x,0,
+               xS(16),yS(16), -1, 1)
 {
        this->remote_control = remote_control;
 }
@@ -169,8 +172,7 @@ int RemoteGUI::keypress_event()
        return result;
 }
 
-RemoteHandler::
-RemoteHandler(RemoteGUI *gui, int color)
+RemoteHandler::RemoteHandler(RemoteGUI *gui, int color)
 {
        this->gui = gui;
        this->color = color;