summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/citra/citra.h12
-rw-r--r--src/citra/citra.vcxproj1
-rw-r--r--src/citra/citra.vcxproj.filters1
-rw-r--r--src/citra/emu_window/emu_window_glfw.cpp30
-rw-r--r--src/citra/emu_window/emu_window_glfw.h2
-rw-r--r--src/citra/version.h6
-rw-r--r--src/common/common.h4
-rw-r--r--src/common/emu_window.h100
-rw-r--r--src/common/scm_rev.h8
-rw-r--r--src/common/version.cpp12
10 files changed, 74 insertions, 102 deletions
diff --git a/src/citra/citra.h b/src/citra/citra.h
index 5a2c60aac..b9254c5da 100644
--- a/src/citra/citra.h
+++ b/src/citra/citra.h
@@ -4,10 +4,12 @@
#pragma once
-#include "version.h"
+#include <string>
-#define APP_NAME "citra"
-#define APP_VERSION "0.01-" VERSION
-#define APP_TITLE APP_NAME " " APP_VERSION
-#define COPYRIGHT "Copyright (C) 2013 Citra Emulator"
+#include "common/common.h"
+
+#define APP_NAME std::string("citra")
+#define APP_VERSION std::string("0.01-") + std::string(g_scm_rev_str)
+#define APP_TITLE (APP_NAME + " " + APP_VERSION)
+#define COPYRIGHT "Copyright (C) 2014 Citra Emulator"
diff --git a/src/citra/citra.vcxproj b/src/citra/citra.vcxproj
index 4ea222fcd..d81ac5bfc 100644
--- a/src/citra/citra.vcxproj
+++ b/src/citra/citra.vcxproj
@@ -206,7 +206,6 @@
<ClInclude Include="citra.h" />
<ClInclude Include="emu_window\emu_window_glfw.h" />
<ClInclude Include="resource.h" />
- <ClInclude Include="version.h" />
</ItemGroup>
<ItemGroup>
<Text Include="CMakeLists.txt" />
diff --git a/src/citra/citra.vcxproj.filters b/src/citra/citra.vcxproj.filters
index b41cdf146..b2685691f 100644
--- a/src/citra/citra.vcxproj.filters
+++ b/src/citra/citra.vcxproj.filters
@@ -14,7 +14,6 @@
<ItemGroup>
<ClInclude Include="citra.h" />
<ClInclude Include="resource.h" />
- <ClInclude Include="version.h" />
<ClInclude Include="emu_window\emu_window_glfw.h">
<Filter>emu_window</Filter>
</ClInclude>
diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp
index 442176d91..e6943f146 100644
--- a/src/citra/emu_window/emu_window_glfw.cpp
+++ b/src/citra/emu_window/emu_window_glfw.cpp
@@ -3,7 +3,10 @@
// Refer to the license.txt file included.
#include "common/common.h"
+
#include "video_core/video_core.h"
+
+#include "citra/citra.h"
#include "citra/emu_window/emu_window_glfw.h"
static void OnKeyEvent(GLFWwindow* win, int key, int action) {
@@ -11,9 +14,9 @@ static void OnKeyEvent(GLFWwindow* win, int key, int action) {
}
static void OnWindowSizeEvent(GLFWwindow* win, int width, int height) {
- EmuWindow_GLFW* emuwin = (EmuWindow_GLFW*)glfwGetWindowUserPointer(win);
- emuwin->set_client_area_width(width);
- emuwin->set_client_area_height(height);
+ EmuWindow_GLFW* emu_window = (EmuWindow_GLFW*)glfwGetWindowUserPointer(win);
+ emu_window->SetClientAreaWidth(width);
+ emu_window->SetClientAreaHeight(height);
}
/// EmuWindow_GLFW constructor
@@ -25,13 +28,14 @@ EmuWindow_GLFW::EmuWindow_GLFW() {
}
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 1);
- render_window_ = glfwCreateWindow(VideoCore::kScreenTopWidth,
- (VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight), "citra", NULL, NULL);
+ m_render_window = glfwCreateWindow(VideoCore::kScreenTopWidth,
+ (VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight),
+ m_window_title.c_str(), NULL, NULL);
// Setup callbacks
- glfwSetWindowUserPointer(render_window_, this);
- //glfwSetKeyCallback(render_window_, OnKeyEvent);
- //glfwSetWindowSizeCallback(render_window_, OnWindowSizeEvent);
+ glfwSetWindowUserPointer(m_render_window, this);
+ //glfwSetKeyCallback(m_render_window, OnKeyEvent);
+ //glfwSetWindowSizeCallback(m_render_window, OnWindowSizeEvent);
DoneCurrent();
}
@@ -43,23 +47,17 @@ EmuWindow_GLFW::~EmuWindow_GLFW() {
/// Swap buffers to display the next frame
void EmuWindow_GLFW::SwapBuffers() {
- glfwSwapBuffers(render_window_);
+ glfwSwapBuffers(m_render_window);
}
/// Polls window events
void EmuWindow_GLFW::PollEvents() {
- // TODO(ShizZy): Does this belong here? This is a reasonable place to update the window title
- // from the main thread, but this should probably be in an event handler...
- static char title[128];
- sprintf(title, "%s (FPS: %02.02f)", window_title_.c_str(), 0.0f);
- glfwSetWindowTitle(render_window_, title);
-
glfwPollEvents();
}
/// Makes the GLFW OpenGL context current for the caller thread
void EmuWindow_GLFW::MakeCurrent() {
- glfwMakeContextCurrent(render_window_);
+ glfwMakeContextCurrent(m_render_window);
}
/// Releases (dunno if this is the "right" word) the GLFW context from the caller thread
diff --git a/src/citra/emu_window/emu_window_glfw.h b/src/citra/emu_window/emu_window_glfw.h
index 6499315c8..5898ec177 100644
--- a/src/citra/emu_window/emu_window_glfw.h
+++ b/src/citra/emu_window/emu_window_glfw.h
@@ -26,7 +26,7 @@ public:
/// Releases (dunno if this is the "right" word) the GLFW context from the caller thread
void DoneCurrent();
- GLFWwindow* render_window_; ///< Internal GLFW render window
+ GLFWwindow* m_render_window; ///< Internal GLFW render window
private:
diff --git a/src/citra/version.h b/src/citra/version.h
deleted file mode 100644
index 07b88c641..000000000
--- a/src/citra/version.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// GENERATED - Do not edit!
-#ifndef VERSION_H_
-#define VERSION_H_
-#define __BUILD__ "122"
-#define VERSION __BUILD__
-#endif // VERSION_H_
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 <string.h>
// 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;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 22:11:38 +0100