actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

The non windows files.

Browse Source
This commit is contained in:
Jason Felds
2013-05-01 23:45:12 -04:00
parent 02d16ce574
commit b1ed735622
3 changed files with 539 additions and 539 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenMapControllers2.cpp
+10 -10
View File
@@ -110,18 +110,18 @@ void ScreenMapControllers2::Init()
MAPPING_SCROLLER_TRANSFORM.Load( m_sName, "MappingScrollerTransform" ); MAPPING_SCROLLER_TRANSFORM.Load( m_sName, "MappingScrollerTransform" );
MAPPING_SCROLLER_SUBDIVISIONS.Load( m_sName, "MappingScrollerSubdivisions" ); MAPPING_SCROLLER_SUBDIVISIONS.Load( m_sName, "MappingScrollerSubdivisions" );
FOREACH( PlayerNumber, vpns, p ) for (PlayerNumber const &p : vpns)
{ {
// mapping scroller // mapping scroller
m_MappingScroller[*p].SetLoop( LOOP_MAPPING_SCROLLER ); m_MappingScroller[p].SetLoop( LOOP_MAPPING_SCROLLER );
m_MappingScroller[*p].SetNumItemsToDraw( MAPPING_SCROLLER_NUM_ITEMS_TO_DRAW ); m_MappingScroller[p].SetNumItemsToDraw( MAPPING_SCROLLER_NUM_ITEMS_TO_DRAW );
m_MappingScroller[*p].Load2(); m_MappingScroller[p].Load2();
m_MappingScroller[*p].SetTransformFromReference( MAPPING_SCROLLER_TRANSFORM ); m_MappingScroller[p].SetTransformFromReference( MAPPING_SCROLLER_TRANSFORM );
m_MappingScroller[*p].SetSecondsPerItem( MAPPING_SCROLLER_SECONDS_PER_ITEM ); m_MappingScroller[p].SetSecondsPerItem( MAPPING_SCROLLER_SECONDS_PER_ITEM );
m_MappingScroller[*p].SetNumSubdivisions( MAPPING_SCROLLER_SUBDIVISIONS ); m_MappingScroller[p].SetNumSubdivisions( MAPPING_SCROLLER_SUBDIVISIONS );
m_MappingScroller[*p].SetName( "MappingScroller"+ssprintf("P%d",(*p)+1) ); m_MappingScroller[p].SetName( "MappingScroller"+ssprintf("P%d",p + 1) );
LOAD_ALL_COMMANDS_AND_SET_XY( m_MappingScroller[*p] ); LOAD_ALL_COMMANDS_AND_SET_XY( m_MappingScroller[p] );
this->AddChild( &m_MappingScroller[*p] ); this->AddChild( &m_MappingScroller[p] );
} }
} }
src/arch/InputHandler/InputHandler_MacOSX_HID.cpp
+6 -6
View File
@@ -120,8 +120,8 @@ void InputHandler_MacOSX_HID::StartDevices()
int n = 0; int n = 0;
ASSERT( m_LoopRef ); ASSERT( m_LoopRef );
FOREACH( HIDDevice *, m_vDevices, i ) for (HIDDevice *i : m_vDevices)
(*i)->StartQueue( m_LoopRef, InputHandler_MacOSX_HID::QueueCallback, this, n++ ); i->StartQueue( m_LoopRef, InputHandler_MacOSX_HID::QueueCallback, this, n++ );
CFRunLoopSourceRef runLoopSource = IONotificationPortGetRunLoopSource( m_NotifyPort ); CFRunLoopSourceRef runLoopSource = IONotificationPortGetRunLoopSource( m_NotifyPort );
@@ -130,8 +130,8 @@ void InputHandler_MacOSX_HID::StartDevices()
InputHandler_MacOSX_HID::~InputHandler_MacOSX_HID() InputHandler_MacOSX_HID::~InputHandler_MacOSX_HID()
{ {
FOREACH( HIDDevice *, m_vDevices, i ) for (HIDDevice *i : m_vDevices)
delete *i; delete i;
if( PREFSMAN->m_bThreadedInput ) if( PREFSMAN->m_bThreadedInput )
{ {
CFRunLoopSourceSignal( m_SourceRef ); CFRunLoopSourceSignal( m_SourceRef );
@@ -142,8 +142,8 @@ InputHandler_MacOSX_HID::~InputHandler_MacOSX_HID()
LOG->Trace( "Input handler thread shut down." ); LOG->Trace( "Input handler thread shut down." );
} }
FOREACH( io_iterator_t, m_vIters, i ) for (io_iterator_t &i : m_vIters)
IOObjectRelease( *i ); IOObjectRelease( i );
IONotificationPortDestroy( m_NotifyPort ); IONotificationPortDestroy( m_NotifyPort );
} }
src/archutils/Darwin/JoystickDevice.cpp
+1 -1
View File
@@ -248,7 +248,7 @@ int JoystickDevice::AssignIDs( InputDevice startID )
{ {
if( !IsJoystick(startID) ) if( !IsJoystick(startID) )
return -1; return -1;
FOREACH( Joystick, m_vSticks, i ) for (auto i = m_vSticks.begin(); i != m_vSticks.end(); ++i)
{ {
if( !IsJoystick(startID) ) if( !IsJoystick(startID) )
{ {