Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated the input plugins reference of hwnd on game start. #2230

Merged
merged 1 commit into from Mar 21, 2015
Merged

Updated the input plugins reference of hwnd on game start. #2230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions Source/Core/Core/Core.cpp
View file
Open in desktop
Expand Up @@ -430,6 +430,7 @@ void EmuThread()
else
{
// Update references in case controllers were refreshed
g_controller_interface.Initialize(s_window_handle);
Pad::LoadConfig();
Keyboard::LoadConfig();
}
Expand All @@ -444,9 +445,10 @@ void EmuThread()

// Activate Wiimotes which don't have source set to "None"
for (unsigned int i = 0; i != MAX_BBMOTES; ++i)
{
if (g_wiimote_sources[i])
GetUsbPointer()->AccessWiiMote(i | 0x100)->Activate(true);

}
}

AudioCommon::InitSoundStream();
Expand Down Expand Up @@ -557,7 +559,8 @@ void EmuThread()

if (init_controllers)
{
Wiimote::Shutdown();
if (core_parameter.bWii)
Wiimote::Shutdown();
Keyboard::Shutdown();
Pad::Shutdown();
init_controllers = false;
Expand Down
7 changes: 4 additions & 3 deletions Source/Core/Core/HotkeyManager.cpp
View file
Open in desktop
Expand Up @@ -117,10 +117,11 @@ const int num_hotkeys = (sizeof(hotkey_labels) / sizeof(hotkey_labels[0]));
namespace HotkeyManagerEmu
{

static u32 hotkeyDown[3];
static HotkeyStatus hotkey;
u32 hotkeyDown[3];
HotkeyStatus hotkey;
bool enabled;

static InputConfig s_config("Hotkeys", _trans("Hotkeys"), "Hotkeys");
InputConfig s_config("Hotkeys", _trans("Hotkeys"), "Hotkeys");

InputConfig* GetConfig()
{
Expand Down
2 changes: 0 additions & 2 deletions Source/Core/Core/HotkeyManager.h
View file
Open in desktop
Expand Up @@ -39,6 +39,4 @@ namespace HotkeyManagerEmu
bool IsEnabled();
void Enable(bool enable_toggle);
bool IsPressed(int Id, bool held);

static bool enabled;
}
3 changes: 3 additions & 0 deletions Source/Core/DolphinWX/InputConfigDiag.cpp
View file
Open in desktop
Expand Up @@ -1060,6 +1060,9 @@ GamepadPage::GamepadPage(wxWindow* parent, InputConfig& config, const unsigned i
mapping->Add(dio, 1, wxEXPAND|wxLEFT|wxTOP|wxBOTTOM, 5);
mapping->Add(control_group_sizer, 0, wxLEFT|wxEXPAND, 5);

wxCommandEvent event;
RefreshDevices(event);

UpdateGUI();

SetSizerAndFit(mapping); // needed
Expand Down
7 changes: 6 additions & 1 deletion Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
View file
Open in desktop
Expand Up @@ -44,7 +44,7 @@ ControllerInterface g_controller_interface;
void ControllerInterface::Initialize(void* const hwnd)
{
if (m_is_init)
return;
DeInit();

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view


m_hwnd = hwnd;

Expand Down Expand Up @@ -102,6 +102,11 @@ void ControllerInterface::Shutdown()
delete d;
}

DeInit();
}

void ControllerInterface::DeInit()
{
m_devices.clear();

#ifdef CIFACE_USE_XINPUT
Expand Down
3 changes: 3 additions & 0 deletions Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
View file
Open in desktop
Expand Up @@ -117,6 +117,9 @@ class ControllerInterface : public ciface::Core::DeviceContainer
void Initialize(void* const hwnd);
void Reinitialize();
void Shutdown();

void DeInit();

bool IsInit() const { return m_is_init; }

void UpdateReference(ControlReference* control, const ciface::Core::DeviceQualifier& default_device) const;
Expand Down