merge

src/GameState.cpp

@@ -2401,6 +2401,14 @@ public:
 		LuaHelpers::CreateTableFromArray( vHP, L );
 		return 1;
 	}
+  static int GetEnabledPlayers(T* p, lua_State *L )
+  {
+    vector<PlayerNumber> vEP;
+    FOREACH_EnabledPlayer( pn )
+      vEP.push_back( pn );
+    LuaHelpers::CreateTableFromArray( vEP, L );
+    return 1;
+  }  
 	static int GetCurrentStyle( T* p, lua_State *L )
 	{
 		Style *pStyle = const_cast<Style *> (p->GetCurrentStyle());
@@ -2554,6 +2562,7 @@ public:
 		ADD_METHOD( SetPreferredSongGroup );
 		ADD_METHOD( GetPreferredSongGroup );
 		ADD_METHOD( GetHumanPlayers );
+    ADD_METHOD( GetEnabledPlayers );
 		ADD_METHOD( GetCurrentStyle );
 		ADD_METHOD( IsAnyHumanPlayerUsingMemoryCard );
 		ADD_METHOD( GetNumStagesForCurrentSongAndStepsOrCourse );

src/arch/arch_default.h

@@ -39,7 +39,7 @@
 #define DEFAULT_INPUT_DRIVER_LIST "X11"
 #endif
 #define DEFAULT_MOVIE_DRIVER_LIST "Theora,FFMpeg,Null"
-#define DEFAULT_SOUND_DRIVER_LIST "pulse,ALSA-sw,OSS,Null"
+#define DEFAULT_SOUND_DRIVER_LIST "ALSA-sw,pulse,OSS,Null"
 #else
 #error Which arch?
 #endif