[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30615] branches/soc-2010-merwin/intern/ ghost/intern: removed unused Macintosh Carbon code

Mike Erwin significant.bit at gmail.com
Thu Jul 22 09:07:28 CEST 2010


Revision: 30615
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30615
Author:   merwin
Date:     2010-07-22 09:07:28 +0200 (Thu, 22 Jul 2010)

Log Message:
-----------
removed unused Macintosh Carbon code

Removed Paths:
-------------
    branches/soc-2010-merwin/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp
    branches/soc-2010-merwin/intern/ghost/intern/GHOST_DisplayManagerCarbon.h
    branches/soc-2010-merwin/intern/ghost/intern/GHOST_WindowCarbon.cpp
    branches/soc-2010-merwin/intern/ghost/intern/GHOST_WindowCarbon.h

Deleted: branches/soc-2010-merwin/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp
===================================================================
--- branches/soc-2010-merwin/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp	2010-07-22 05:59:50 UTC (rev 30614)
+++ branches/soc-2010-merwin/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp	2010-07-22 07:07:28 UTC (rev 30615)
@@ -1,174 +0,0 @@
-/**
- * $Id$
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/**
-
- * $Id$
- * Copyright (C) 2001 NaN Technologies B.V.
- * @author	Maarten Gribnau
- * @date	September 21, 2001
- */
-
-#include "GHOST_DisplayManagerCarbon.h"
-#include "GHOST_Debug.h"
-
-// We do not support multiple monitors at the moment
-
-
-GHOST_DisplayManagerCarbon::GHOST_DisplayManagerCarbon(void)
-{
-	if (::CGGetActiveDisplayList(0, NULL, &m_numDisplays) != CGDisplayNoErr)
-	{
-		m_numDisplays = 0;
-		m_displayIDs = NULL;
-	}
-	if (m_numDisplays > 0)
-	{
-		m_displayIDs = new CGDirectDisplayID [m_numDisplays];
-		GHOST_ASSERT((m_displayIDs!=NULL), "GHOST_DisplayManagerCarbon::GHOST_DisplayManagerCarbon(): memory allocation failed");
-		::CGGetActiveDisplayList(m_numDisplays, m_displayIDs, &m_numDisplays);
-	}
-}
-
-
-GHOST_TSuccess GHOST_DisplayManagerCarbon::getNumDisplays(GHOST_TUns8& numDisplays) const
-{
-	numDisplays = (GHOST_TUns8) m_numDisplays;
-	return GHOST_kSuccess;
-}
-
-
-GHOST_TSuccess GHOST_DisplayManagerCarbon::getNumDisplaySettings(GHOST_TUns8 display, GHOST_TInt32& numSettings) const
-{
-	GHOST_ASSERT((display==kMainDisplay), "GHOST_DisplayManagerCarbon::getNumDisplaySettings(): only main display is supported");
-	
-	CFArrayRef displayModes;
-	displayModes = ::CGDisplayAvailableModes(m_displayIDs[display]);
-	CFIndex numModes = ::CFArrayGetCount(displayModes);
-	numSettings = (GHOST_TInt32)numModes;
-	
-	return GHOST_kSuccess;
-}
-
-
-GHOST_TSuccess GHOST_DisplayManagerCarbon::getDisplaySetting(GHOST_TUns8 display, GHOST_TInt32 index, GHOST_DisplaySetting& setting) const
-{
-	GHOST_ASSERT((display==kMainDisplay), "GHOST_DisplayManagerCarbon::getDisplaySetting(): only main display is supported");
-	
-	CFArrayRef displayModes;
-	CGDirectDisplayID d = m_displayIDs[display];
-	displayModes = ::CGDisplayAvailableModes(d);
-	//CFIndex numModes = ::CFArrayGetCount(displayModes);/*unused*/
-	//GHOST_TInt32 numSettings = (GHOST_TInt32)numModes; /*unused*/
-	 CFDictionaryRef displayModeValues = (CFDictionaryRef)::CFArrayGetValueAtIndex(displayModes, index);
-			
-	setting.xPixels		= getValue(displayModeValues, kCGDisplayWidth);
-	setting.yPixels		= getValue(displayModeValues, kCGDisplayHeight);
-	setting.bpp			= getValue(displayModeValues, kCGDisplayBitsPerPixel);
-	setting.frequency	= getValue(displayModeValues, kCGDisplayRefreshRate);
-			
-#ifdef GHOST_DEBUG
-	printf("display mode: width=%d, height=%d, bpp=%d, frequency=%d\n", setting.xPixels, setting.yPixels, setting.bpp, setting.frequency);
-#endif // GHOST_DEBUG
-
-	return GHOST_kSuccess;
-}
-
-
-GHOST_TSuccess GHOST_DisplayManagerCarbon::getCurrentDisplaySetting(GHOST_TUns8 display, GHOST_DisplaySetting& setting) const
-{
-	GHOST_ASSERT((display==kMainDisplay), "GHOST_DisplayManagerCarbon::getCurrentDisplaySetting(): only main display is supported");
-        
-	CFDictionaryRef displayModeValues = ::CGDisplayCurrentMode(m_displayIDs[display]);
-	
-	setting.xPixels		= getValue(displayModeValues, kCGDisplayWidth);
-	setting.yPixels		= getValue(displayModeValues, kCGDisplayHeight);
-	setting.bpp			= getValue(displayModeValues, kCGDisplayBitsPerPixel);
-	setting.frequency	= getValue(displayModeValues, kCGDisplayRefreshRate);
-
-#ifdef GHOST_DEBUG
-	printf("current display mode: width=%d, height=%d, bpp=%d, frequency=%d\n", setting.xPixels, setting.yPixels, setting.bpp, setting.frequency);
-#endif // GHOST_DEBUG
-
-	return GHOST_kSuccess;
-}
-
-
-GHOST_TSuccess GHOST_DisplayManagerCarbon::setCurrentDisplaySetting(GHOST_TUns8 display, const GHOST_DisplaySetting& setting)
-{
-	GHOST_ASSERT((display==kMainDisplay), "GHOST_DisplayManagerCarbon::setCurrentDisplaySetting(): only main display is supported");
-
-#ifdef GHOST_DEBUG
-	printf("GHOST_DisplayManagerCarbon::setCurrentDisplaySetting(): requested settings:\n");
-	printf("  setting.xPixels=%d\n", setting.xPixels);
-	printf("  setting.yPixels=%d\n", setting.yPixels);
-	printf("  setting.bpp=%d\n", setting.bpp);
-	printf("  setting.frequency=%d\n", setting.frequency);
-#endif // GHOST_DEBUG
-
-	CFDictionaryRef displayModeValues = ::CGDisplayBestModeForParametersAndRefreshRate(
-		m_displayIDs[display],
-		(size_t)setting.bpp,
-		(size_t)setting.xPixels,
-		(size_t)setting.yPixels,
-		(CGRefreshRate)setting.frequency,
-		NULL);
-
-#ifdef GHOST_DEBUG
-	printf("GHOST_DisplayManagerCarbon::setCurrentDisplaySetting(): switching to:\n");
-	printf("  setting.xPixels=%d\n", getValue(displayModeValues, kCGDisplayWidth));
-	printf("  setting.yPixels=%d\n", getValue(displayModeValues, kCGDisplayHeight));
-	printf("  setting.bpp=%d\n", getValue(displayModeValues, kCGDisplayBitsPerPixel));
-	printf("  setting.frequency=%d\n", getValue(displayModeValues, kCGDisplayRefreshRate));
-#endif // GHOST_DEBUG
-
-	CGDisplayErr err = ::CGDisplaySwitchToMode(m_displayIDs[display], displayModeValues);
-        
-	return err == CGDisplayNoErr ? GHOST_kSuccess : GHOST_kFailure;
-}
-
-
-long GHOST_DisplayManagerCarbon::getValue(CFDictionaryRef values, CFStringRef key) const
-{
-    CFNumberRef numberValue = (CFNumberRef) CFDictionaryGetValue(values, key);
-    
-    if (!numberValue)
-    {
-        return -1;
-    }
-    
-    long intValue;
-    
-    if (!CFNumberGetValue(numberValue, kCFNumberLongType, &intValue))
-    {
-        return -1;
-    }
-    
-    return intValue;
-}
-

Deleted: branches/soc-2010-merwin/intern/ghost/intern/GHOST_DisplayManagerCarbon.h
===================================================================
--- branches/soc-2010-merwin/intern/ghost/intern/GHOST_DisplayManagerCarbon.h	2010-07-22 05:59:50 UTC (rev 30614)
+++ branches/soc-2010-merwin/intern/ghost/intern/GHOST_DisplayManagerCarbon.h	2010-07-22 07:07:28 UTC (rev 30615)
@@ -1,116 +0,0 @@
-/**
- * $Id$
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-/**
- * @file	GHOST_DisplayManagerCarbon.h
- * Declaration of GHOST_DisplayManagerCarbon class.
- */
-
-#ifndef _GHOST_DISPLAY_MANAGER_CARBON_H_
-#define _GHOST_DISPLAY_MANAGER_CARBON_H_
-
-#ifndef __APPLE__
-#error Apple only!
-#endif // __APPLE__
-
-#include "GHOST_DisplayManager.h"
-
-#define __CARBONSOUND__
-#include <Carbon/Carbon.h>
-
-/**
- * Manages system displays  (Mac OSX/Carbon implementation).
- * @see GHOST_DisplayManager
- * @author	Maarten Gribnau
- * @date	September 21, 2001
- */
-class GHOST_DisplayManagerCarbon : public GHOST_DisplayManager
-{
-public:
-	/**
-	 * Constructor.
-	 */
-	GHOST_DisplayManagerCarbon(void);
-
-	/**
-	 * Returns the number of display devices on this system.
-	 * @param numDisplays The number of displays on this system.
-	 * @return Indication of success.
-	 */
-	virtual GHOST_TSuccess getNumDisplays(GHOST_TUns8& numDisplays) const;
-
-	/**
-	 * Returns the number of display settings for this display device.
-	 * @param display The index of the display to query with 0 <= display < getNumDisplays().
-	 * @param setting The number of settings of the display device with this index.
-	 * @return Indication of success.
-	 */
-	virtual GHOST_TSuccess getNumDisplaySettings(GHOST_TUns8 display, GHOST_TInt32& numSettings) const;
-
-	/**
-	 * Returns the current setting for this display device. 
-	 * @param display The index of the display to query with 0 <= display < getNumDisplays().
-	 * @param index	  The setting index to be returned.
-	 * @param setting The setting of the display device with this index.
-	 * @return Indication of success.
-	 */
-	virtual GHOST_TSuccess getDisplaySetting(GHOST_TUns8 display, GHOST_TInt32 index, GHOST_DisplaySetting& setting) const;
-
-	/**
-	 * Returns the current setting for this display device. 
-	 * @param display The index of the display to query with 0 <= display < getNumDisplays().
-	 * @param setting The current setting of the display device with this index.
-	 * @return Indication of success.
-	 */
-	virtual GHOST_TSuccess getCurrentDisplaySetting(GHOST_TUns8 display, GHOST_DisplaySetting& setting) const;
-
-	/**
-	 * Changes the current setting for this display device. 
-	 * @param display The index of the display to query with 0 <= display < getNumDisplays().
-	 * @param setting The current setting of the display device with this index.
-	 * @return Indication of success.
-	 */

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list