Changeset 7177

Timestamp:

02/27/08 16:06:30 (9 months ago)

Author:

vboxsync

Message:

Mac OS X: Added a skeleton of the iChat Theater implementation.

Files:

• trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (modified) (4 diffs)
• trunk/src/VBox/Frontends/VirtualBox/include/VBoxIChatTheaterWrapper.h (added)
• trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp (modified) (2 diffs)
• trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBQuartz2D.cpp (modified) (2 diffs)
• trunk/src/VBox/Frontends/VirtualBox/src/darwin/VBoxIChatTheaterWrapper.m (added)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -130 +130 @@
-# For the launch trick we need different inode numbers.
-VirtualBox_INST = $(INST_BIN)VirtualBox $(INST_BIN)VirtualBoxVM
+
+ # For testing iChat Theater stuff change
+ # the sdk path
+ ifdef VBOX_WITH_ICHAT_THEATER 
+  VBOX_PATH_MACOSX_SDK = /Developer/SDKs/MacOSX10.5.sdk
+ endif
+
-endif
-
@@ -254 +261 @@
-        src/VBoxFBQuartz2D.cpp
-
+ifdef VBOX_WITH_ICHAT_THEATER
+ VirtualBox_SOURCES.darwin += \
+         src/darwin/VBoxIChatTheaterWrapper.m
+endif
+
-ifneq ($(BUILD_TARGET),win)
-src/HappyHttp.cpp_CXXFLAGS += -fexceptions
@@ -282 +294 @@
- VirtualBox_DEFS.darwin  += VBOX_WITH_HACKED_QT
-#endif
+ifdef VBOX_WITH_ICHAT_THEATER
+ VirtualBox_DEFS.darwin += VBOX_WITH_ICHAT_THEATER
+endif
-ifneq ($(BUILD_TYPE),release)
- # non-release builds has some extra features.
@@ -326 +341 @@
-VirtualBox_LDFLAGS.os2    = -Zlinker /PM:PM -Zno-fork
-VirtualBox_LDFLAGS.darwin = -framework IOKit
+ifdef VBOX_WITH_ICHAT_THEATER
+ VirtualBox_LDFLAGS.darwin += -framework Foundation -framework AppKit -framework InstantMessage -framework QuartzCore
+endif
-VirtualBox_LIBS.win       = \
-        $(PATH_SDK_WINPSDK_LIB)/Htmlhelp.Lib \

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -47 +47 @@
-#include <X11/Xlib.h>
-#include <XKeyboard.h>
+#endif
+
+#ifdef Q_WS_MAC
+#include "VBoxIChatTheaterWrapper.h"
-#endif
-
@@ -580 +584 @@
-
-#ifdef Q_WS_MAC
+# ifdef VBOX_WITH_ICHAT_THEATER
+    initSharedAVManager();
+# endif
-    /* prepare the dock images */
-    dockImgStatePaused    = ::DarwinCreateDockBadge ("state_paused_16px.png");

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBQuartz2D.cpp

@@ -25 +25 @@
-/* Needed for checking against seamless mode */
-#include "VBoxConsoleWnd.h"
+#include "VBoxIChatTheaterWrapper.h"
-
-/* Qt includes */
@@ -325 +326 @@
-    }
-    CGColorSpaceRelease (cs);
+#ifdef VBOX_WITH_ICHAT_THEATER
+    setImageRef (mImage);
+#endif
-
-//    if (remind)