From 5da03e821ef281909e65c3df33f67596074ae98a Mon Sep 17 00:00:00 2001 From: bunnei Date: Tue, 8 Apr 2014 23:18:23 -0400 Subject: - removed deprecated version.h - cleaned up window title - cleaned up emu_window_glfw/emu_window --- src/common/common.h | 4 +- src/common/emu_window.h | 100 +++++++++++++++++++----------------------------- src/common/scm_rev.h | 8 ++-- src/common/version.cpp | 12 +++--- 4 files changed, 52 insertions(+), 72 deletions(-) (limited to 'src/common') diff --git a/src/common/common.h b/src/common/common.h index 8795c8a0e..64a0d7812 100644 --- a/src/common/common.h +++ b/src/common/common.h @@ -13,8 +13,8 @@ #include // SVN version number -extern const char *scm_rev_str; -extern const char *netplay_dolphin_ver; +extern const char *g_scm_rev_str; +extern const char *g_netplay_citra_ver; // Force enable logging in the right modes. For some reason, something had changed // so that debugfast no longer logged. diff --git a/src/common/emu_window.h b/src/common/emu_window.h index 7f68c9237..731784756 100644 --- a/src/common/emu_window.h +++ b/src/common/emu_window.h @@ -1,36 +1,10 @@ -/** - * Copyright (C) 2005-2012 Gekko Emulator - * - * @file emu_window.h - * @author Neobrain - * @date 2012-06-01 - * @brief Interface for implementing an emulator window manager - * - * @section LICENSE - * 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 at - * http://www.gnu.org/copyleft/gpl.html - * - * Official project repository can be found at: - * http://code.google.com/p/gekko-gc-emu/ - */ - -#ifndef CORE_EMUWINDOW_H_ -#define CORE_EMUWINDOW_H_ +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -#include "common/common.h" +#pragma once -//namespace input_common -//{ -//class KeyboardInput; -//} +#include "common/common.h" // Abstraction class used to provide an interface between emulation code and the frontend (e.g. SDL, // QGLWidget, GLFW, etc...) @@ -57,46 +31,52 @@ public: /// Releases (dunno if this is the "right" word) the GLFW context from the caller thread virtual void DoneCurrent() = 0; - /** - * @brief Called from KeyboardInput constructor to notify EmuWindow about its presence - * @param controller_interface Pointer to a running KeyboardInput interface - */ - //void set_controller_interface(input_common::KeyboardInput* controller_interface) { - // controller_interface_ = controller_interface; - //} - //input_common::KeyboardInput* controller_interface() { return controller_interface_; } - - Config config() { return config_; } - void set_config(Config val) { config_ = val; } + Config GetConfig() const { + return m_config; + } + + void SetConfig(const Config& val) { + m_config = val; + } - int client_area_width() { return client_area_width_; } - void set_client_area_width(int val) { client_area_width_ = val; } + int GetClientAreaWidth() const { + return m_client_area_width; + } - int client_area_height() { return client_area_height_; } - void set_client_area_height(int val) { client_area_height_ = val; } + void SetClientAreaWidth(const int val) { + m_client_area_width = val; + } - std::string window_title() { return window_title_; } - void set_window_title(std::string val) { window_title_ = val; } + int GetClientAreaHeight() const { + return m_client_area_height; + } + + void SetClientAreaHeight(const int val) { + m_client_area_height = val; + } + + std::string GetWindowTitle() { + return m_window_title; + } + + void SetWindowTitle(std::string val) { + m_window_title = val; + } protected: - EmuWindow() : client_area_width_(640), client_area_height_(480) { + EmuWindow() : m_client_area_width(640), m_client_area_height(480) { char window_title[255]; - sprintf(window_title, "citra [%s|%s] - %s", - "null-cpu", - "null-renderer", - __DATE__); - window_title_ = window_title; + sprintf(window_title, "citra-%s", g_scm_rev_str); + m_window_title = window_title; } virtual ~EmuWindow() {} - std::string window_title_; ///< Current window title, should be used by window impl. + std::string m_window_title; ///< Current window title, should be used by window impl. - int client_area_width_; ///< Current client width, should be set by window impl. - int client_area_height_; ///< Current client height, should be set by window impl. + int m_client_area_width; ///< Current client width, should be set by window impl. + int m_client_area_height; ///< Current client height, should be set by window impl. private: - Config config_; ///< Internal configuration + Config m_config; ///< Internal configuration }; - -#endif // CORE_EMUWINDOW_H_ diff --git a/src/common/scm_rev.h b/src/common/scm_rev.h index 62a304f40..cd5df9ca8 100644 --- a/src/common/scm_rev.h +++ b/src/common/scm_rev.h @@ -1,4 +1,4 @@ -#define SCM_REV_STR "de0a034a849f5a1cbe2fed9ef2cc4095c56e672a" -#define SCM_DESC_STR "de0a034" -#define SCM_BRANCH_STR "fixed-directorys-for-neo" -#define SCM_IS_MASTER 0 +#define SCM_REV_STR "d0674cc98bfa5729168274cde62a4e69343f8524" +#define SCM_DESC_STR "d0674cc" +#define SCM_BRANCH_STR "master" +#define SCM_IS_MASTER 1 diff --git a/src/common/version.cpp b/src/common/version.cpp index f0df884d7..2e0c7390c 100644 --- a/src/common/version.cpp +++ b/src/common/version.cpp @@ -13,7 +13,7 @@ #define BUILD_TYPE_STR "" #endif -const char *scm_rev_str = "emu " +const char *g_scm_rev_str = #if !SCM_IS_MASTER "[" SCM_BRANCH_STR "] " #endif @@ -35,11 +35,11 @@ const char *scm_rev_str = "emu " #endif #ifdef _WIN32 -const char *netplay_dolphin_ver = SCM_DESC_STR " W" NP_ARCH; -#elif __APPLE__ -const char *netplay_dolphin_ver = SCM_DESC_STR " M" NP_ARCH; -#else -const char *netplay_dolphin_ver = SCM_DESC_STR " L" NP_ARCH; +const char *g_netplay_citra_ver = SCM_DESC_STR " W" NP_ARCH; +#elif __APPLE__ +const char *g_netplay_citra_ver = SCM_DESC_STR " M" NP_ARCH; +#else +const char *g_netplay_citra_ver = SCM_DESC_STR " L" NP_ARCH; #endif const char *scm_rev_git_str = SCM_REV_STR; -- cgit v1.2.3