Changeset 22305 in vbox for trunk/src/VBox/Frontends/VBoxSDL

Timestamp:

Aug 17, 2009 5:37:41 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

51179

Message:

Main: generic callback wrappers mechanism

File:

• trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp (modified) (6 diffs)

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -854 +854 @@
     uint32_t memorySize = 0;
     uint32_t vramSize = 0;
-    VBoxSDLCallback *callback = NULL;
-    VBoxSDLConsoleCallback *consoleCallback = NULL;
+    VBoxSDLCallback *cbVBoxImpl = NULL;
+    /* wrapper around above object */
+    ComPtr<IVirtualBoxCallback> callback;
+    VBoxSDLConsoleCallback *cbConsoleImpl = NULL;
+    ComPtr<IConsoleCallback> consoleCallback;
+
     bool fFullscreen = false;
     bool fResizable = true;
@@ -1850 +1854 @@
 #endif
 
+
     for (ULONG i = 0; i < gcMonitors; i++)
     {
         // register our framebuffer
         rc = gDisplay->SetFramebuffer(i, gpFramebuffer[i]);
-        if (rc != S_OK)
+        if (FAILED(rc))
         {
             RTPrintf("Error: could not register framebuffer object!\n");
@@ -1866 +1871 @@
 
     // register a callback for global events
-    callback = new VBoxSDLCallback();
-    callback->AddRef();
+    cbVBoxImpl = new VBoxSDLCallback();
+    rc = createCallbackWrapper((IVirtualBoxCallback*)cbVBoxImpl, callback.asOutParam());
+    if (FAILED(rc))
+        goto leave;
     virtualBox->RegisterCallback(callback);
 
     // register a callback for machine events
-    consoleCallback = new VBoxSDLConsoleCallback();
-    consoleCallback->AddRef();
+    cbConsoleImpl = new VBoxSDLConsoleCallback();
+    rc = createCallbackWrapper((IConsoleCallback*)cbConsoleImpl, consoleCallback.asOutParam());
+    if (FAILED(rc))
+        goto leave;
     gConsole->RegisterCallback(consoleCallback);
     // until we've tried to to start the VM, ignore power off events
-    consoleCallback->ignorePowerOffEvents(true);
+    cbConsoleImpl->ignorePowerOffEvents(true);
 
 #ifdef VBOX_WITH_VRDP
@@ -2172 +2181 @@
     // accept power off events from now on because we're running
     // note that there's a possible race condition here...
-    consoleCallback->ignorePowerOffEvents(false);
+    cbConsoleImpl->ignorePowerOffEvents(false);
 
     rc = gConsole->COMGETTER(Keyboard)(gKeyboard.asOutParam());
@@ -2685 +2694 @@
         && machineState == MachineState_Running)
     {
-        consoleCallback->ignorePowerOffEvents(true);
+        cbConsoleImpl->ignorePowerOffEvents(true);
         ComPtr <IProgress> progress;
         CHECK_ERROR_BREAK(gConsole, PowerDown(progress.asOutParam()));
@@ -2792 +2801 @@
     gMachine = NULL;
     session = NULL;
-    LogFlow(("Releasing callback handlers...\n"));
-    if (callback)
-        callback->Release();
-    if (consoleCallback)
-        consoleCallback->Release();
-
     LogFlow(("Releasing VirtualBox object...\n"));
     virtualBox = NULL;