Changeset 3571 in vbox
- Timestamp:
- Jul 12, 2007 8:03:18 AM (18 years ago)
- Location:
- trunk/src/VBox
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.cpp
r3569 r3571 200 200 } 201 201 202 /* Default framebuffer render mode is normal (draw the entire framebuffer) */ 203 mRenderMode = RenderModeNormal; 204 202 205 resizeGuest(); 203 206 Assert(mScreen); … … 366 369 /* Not yet implemented */ 367 370 *aOverlay = 0; 371 return S_OK; 372 } 373 374 /** 375 * Return the current framebuffer render mode 376 * 377 * @returns COM status code 378 * @param renderMode framebuffer render mode 379 */ 380 STDMETHODIMP VBoxSDLFB::COMGETTER(RenderMode) (FramebufferRenderMode_T *renderMode) 381 { 382 if (!renderMode) 383 return E_POINTER; 384 *renderMode = mRenderMode; 385 return S_OK; 386 } 387 388 /** 389 * Change the current framebuffer render mode 390 * 391 * @returns COM status code 392 * @param renderMode framebuffer render mode 393 */ 394 STDMETHODIMP VBoxSDLFB::COMSETTER(RenderMode) (FramebufferRenderMode_T renderMode) 395 { 396 if (!renderMode) 397 return E_POINTER; 398 mRenderMode = renderMode; 368 399 return S_OK; 369 400 } -
trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.h
r3569 r3571 95 95 STDMETHOD(COMGETTER(HeightReduction)) (ULONG *heightReduction); 96 96 STDMETHOD(COMGETTER(Overlay)) (IFramebufferOverlay **aOverlay); 97 STDMETHOD(COMGETTER(RenderMode)) (FramebufferRenderMode_T *renderMode); 98 STDMETHOD(COMSETTER(RenderMode)) (FramebufferRenderMode_T renderMode); 97 99 98 100 STDMETHOD(NotifyUpdate)(ULONG x, ULONG y, … … 188 190 FramebufferPixelFormat_T mPixelFormat; 189 191 192 /* Framebuffer render mode */ 193 FramebufferRenderMode_T mRenderMode; 194 190 195 /** the application Icon */ 191 196 SDL_Surface *mWMIcon; -
trunk/src/VBox/Frontends/VirtualBox/include/VBoxFrameBuffer.h
r3569 r3571 212 212 STDMETHOD(COMGETTER(HeightReduction)) (ULONG *aHeightReduction); 213 213 STDMETHOD(COMGETTER(Overlay)) (IFramebufferOverlay **aOverlay); 214 STDMETHOD(COMGETTER(RenderMode)) (FramebufferRenderMode_T *renderMode); 215 STDMETHOD(COMSETTER(RenderMode)) (FramebufferRenderMode_T renderMode); 214 216 215 217 STDMETHOD(Lock)(); … … 277 279 int mHgt; 278 280 281 /* Framebuffer render mode */ 282 FramebufferRenderMode_T mRenderMode; 283 279 284 #if defined (Q_OS_WIN32) 280 285 private: -
trunk/src/VBox/Frontends/VirtualBox/src/VBoxFrameBuffer.cpp
r3569 r3571 49 49 { 50 50 AssertMsg (mView, ("VBoxConsoleView must not be null\n")); 51 52 /* Default framebuffer render mode is normal (draw the entire framebuffer) */ 53 mRenderMode = RenderModeNormal; 51 54 } 52 55 … … 123 126 /* not yet implemented */ 124 127 *aOverlay = 0; 128 return S_OK; 129 } 130 131 /** 132 * Return the current framebuffer render mode 133 * 134 * @returns COM status code 135 * @param renderMode framebuffer render mode 136 */ 137 STDMETHODIMP VBoxFrameBuffer::COMGETTER(RenderMode) (FramebufferRenderMode_T *renderMode) 138 { 139 if (!renderMode) 140 return E_POINTER; 141 *renderMode = mRenderMode; 142 return S_OK; 143 } 144 145 /** 146 * Change the current framebuffer render mode 147 * 148 * @returns COM status code 149 * @param renderMode framebuffer render mode 150 */ 151 STDMETHODIMP VBoxFrameBuffer::COMSETTER(RenderMode) (FramebufferRenderMode_T renderMode) 152 { 153 if (!renderMode) 154 return E_POINTER; 155 mRenderMode = renderMode; 125 156 return S_OK; 126 157 } -
trunk/src/VBox/Main/FramebufferImpl.cpp
r3569 r3571 30 30 mData = NULL; 31 31 RTSemMutexCreate(&mMutex); 32 33 /* Default framebuffer render mode is normal (draw the entire framebuffer) */ 34 mRenderMode = RenderModeNormal; 32 35 } 33 36 … … 50 53 mData = new uint8_t[mLineSize * height]; 51 54 memset(mData, 0, mLineSize * height); 55 52 56 return S_OK; 53 57 } … … 119 123 /* no overlay */ 120 124 *aOverlay = 0; 125 return S_OK; 126 } 127 128 /** 129 * Return the current framebuffer render mode 130 * 131 * @returns COM status code 132 * @param renderMode framebuffer render mode 133 */ 134 STDMETHODIMP InternalFramebuffer::COMGETTER(RenderMode) (FramebufferRenderMode_T *renderMode) 135 { 136 if (!renderMode) 137 return E_POINTER; 138 *renderMode = mRenderMode; 139 return S_OK; 140 } 141 142 /** 143 * Change the current framebuffer render mode 144 * 145 * @returns COM status code 146 * @param renderMode framebuffer render mode 147 */ 148 STDMETHODIMP InternalFramebuffer::COMSETTER(RenderMode) (FramebufferRenderMode_T renderMode) 149 { 150 if (!renderMode) 151 return E_POINTER; 152 mRenderMode = renderMode; 121 153 return S_OK; 122 154 } -
trunk/src/VBox/Main/USBProxyService.cpp
r3566 r3571 563 563 564 564 565 void USBProxyService::detachingDevice (HostUSBDevice * /*aDevice*/)566 { 567 } 568 569 570 int USBProxyService::releaseDevice (HostUSBDevice * /*aDevice*/)565 void USBProxyService::detachingDevice (HostUSBDevice * /* aDevice */) 566 { 567 } 568 569 570 int USBProxyService::releaseDevice (HostUSBDevice * /* aDevice */) 571 571 { 572 572 return VERR_NOT_IMPLEMENTED; -
trunk/src/VBox/Main/idl/VirtualBox.xidl
r3570 r3571 6125 6125 </enum> 6126 6126 6127 <enum 6128 name="FramebufferRenderMode" 6129 uuid="456bdd27-63aa-458f-a970-8e8802732737" 6130 > 6131 <const name="RenderModeNormal" value="0"/> 6132 <const name="RenderModeSeamless" value="1"/> 6133 <const name="RenderModeHostWindow" value="2"/> 6134 </enum> 6135 6127 6136 <interface 6128 6137 name="IFramebuffer" extends="$unknown" … … 6152 6161 <attribute name="pixelFormat" type="FramebufferPixelFormat" readonly="yes"> 6153 6162 <desc>Framebuffer pixel format.</desc> 6163 </attribute> 6164 6165 <attribute name="renderMode" type="FramebufferRenderMode" readonly="no"> 6166 <desc>Framebuffer rendering mode.</desc> 6154 6167 </attribute> 6155 6168 -
trunk/src/VBox/Main/include/FramebufferImpl.h
r3569 r3571 56 56 STDMETHOD(COMGETTER(HeightReduction)) (ULONG *heightReduction); 57 57 STDMETHOD(COMGETTER(Overlay)) (IFramebufferOverlay **aOverlay); 58 STDMETHOD(COMGETTER(RenderMode)) (FramebufferRenderMode_T *renderMode); 59 STDMETHOD(COMSETTER(RenderMode)) (FramebufferRenderMode_T renderMode); 58 60 59 61 // IFramebuffer methods … … 84 86 uint8_t *mData; 85 87 RTSEMMUTEX mMutex; 88 89 /* Framebuffer render mode */ 90 FramebufferRenderMode_T mRenderMode; 86 91 }; 87 92
Note:
See TracChangeset
for help on using the changeset viewer.