Skip to content
This repository has been archived by the owner on Sep 7, 2021. It is now read-only.

Commit

Permalink
Merge branch 'master' of github.com:jkuhlmann/gainput
Browse files Browse the repository at this point in the history
  • Loading branch information
jkuhlmann committed Jul 24, 2013
2 parents b875526 + c389e40 commit 1a93821
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 6 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,6 @@ __pycache__/
gainput_2008.*
docs/
test/Catch/

gainput.sdf
gainput.sln
gainput.unsuccessfulbuild
2 changes: 1 addition & 1 deletion lib/include/gainput/recorder/GainputInputPlayer.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace gainput
* In order for input recording to be available, Gainput must have been built with
* \c GAINPUT_ENABLE_RECORDER defined.
*/
class InputPlayer : public DeviceStateModifier
class GAINPUT_LIBEXPORT InputPlayer : public DeviceStateModifier
{
public:
/// Initializes the player.
Expand Down
2 changes: 1 addition & 1 deletion lib/include/gainput/recorder/GainputInputRecorder.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace gainput
* In order for input recording to be available, Gainput must have been built with
* \c GAINPUT_ENABLE_RECORDER defined.
*/
class InputRecorder
class GAINPUT_LIBEXPORT InputRecorder
{
public:
/// Initializes the recorder.
Expand Down
4 changes: 2 additions & 2 deletions lib/include/gainput/recorder/GainputInputRecording.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace gainput
{

/// A single recorded change for a device button.
struct RecordedDeviceButtonChange
struct GAINPUT_LIBEXPORT RecordedDeviceButtonChange
{
/// The time at which the change occurred.
uint64_t time;
Expand Down Expand Up @@ -36,7 +36,7 @@ struct RecordedDeviceButtonChange
* \sa InputPlayer
* \sa InputRecorder
*/
class InputRecording
class GAINPUT_LIBEXPORT InputRecording
{
public:
/// Initializes the recording in an empty state.
Expand Down
12 changes: 12 additions & 0 deletions lib/source/gainput/GainputInputManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,12 @@ InputManager::HandleMessage(const MSG& msg)
it != devices_.end();
++it)
{
#if defined(GAINPUT_DEV)
if (it->second->IsSynced())
{
continue;
}
#endif
if (it->second->GetType() == InputDevice::DT_KEYBOARD)
{
InputDeviceKeyboard* keyboard = static_cast<InputDeviceKeyboard*>(it->second);
Expand Down Expand Up @@ -279,6 +285,12 @@ InputManager::HandleInput(AInputEvent* event)
it != devices_.end();
++it)
{
#if defined(GAINPUT_DEV)
if (it->second->IsSynced())
{
continue;
}
#endif
if (it->second->GetType() == InputDevice::DT_TOUCH)
{
InputDeviceTouch* touch = static_cast<InputDeviceTouch*>(it->second);
Expand Down
4 changes: 3 additions & 1 deletion lib/source/gainput/dev/GainputNetListener.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,10 @@ NetListener::Accept()

namespace gainput {

NetListener::NetListener(const NetAddress& address) :
NetListener::NetListener(const NetAddress& address, Allocator& allocator) :
address(address),
allocator(allocator),
blocking(true),
listenSocket(INVALID_SOCKET)
{

Expand Down

0 comments on commit 1a93821

Please sign in to comment.