Author: bklaas
Date: Fri Aug 27 11:16:03 2010
New Revision: 9075
URL: http://svn.slimdevices.com/jive?rev=9075&view=rev
Log:
Fixed Bug: 16487
Fixed Bug: 16486
Description: revert SDL changes that were causing Jive and desktop Squeezeplay
to not respond to UI events
Modified:
7.6/trunk/squeezeplay/src/SDL-1.2.13/src/SDL.c
7.6/trunk/squeezeplay/src/SDL-1.2.13/src/events/SDL_events.c
Modified: 7.6/trunk/squeezeplay/src/SDL-1.2.13/src/SDL.c
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/SDL-1.2.13/src/SDL.c?rev=9075&r1=9074&r2=9075&view=diff
==============================================================================
--- 7.6/trunk/squeezeplay/src/SDL-1.2.13/src/SDL.c (original)
+++ 7.6/trunk/squeezeplay/src/SDL-1.2.13/src/SDL.c Fri Aug 27 11:16:03 2010
@@ -107,14 +107,6 @@
}
SDL_initialized |= SDL_INIT_TIMER;
- /* if we have timers but no Video then we still need the event
loop */
- if (!(flags & SDL_INIT_VIDEO)) {
- /* Start the event loop */
- if ( SDL_StartEventLoop(flags) < 0 ) {
- SDL_TimerQuit();
- return(-1);
- }
- }
}
#else
if ( flags & SDL_INIT_TIMER ) {
Modified: 7.6/trunk/squeezeplay/src/SDL-1.2.13/src/events/SDL_events.c
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/SDL-1.2.13/src/events/SDL_events.c?rev=9075&r1=9074&r2=9075&view=diff
==============================================================================
--- 7.6/trunk/squeezeplay/src/SDL-1.2.13/src/events/SDL_events.c (original)
+++ 7.6/trunk/squeezeplay/src/SDL-1.2.13/src/events/SDL_events.c Fri Aug 27
11:16:03 2010
@@ -239,18 +239,16 @@
SDL_eventstate &= ~(0x00000001 << SDL_SYSWMEVENT);
SDL_ProcessEvents[SDL_SYSWMEVENT] = SDL_IGNORE;
- /* Initialize event handlers */
- if (flags & SDL_INIT_VIDEO) {
- retcode = 0;
- retcode += SDL_AppActiveInit();
- retcode += SDL_KeyboardInit();
- retcode += SDL_MouseInit();
- retcode += SDL_QuitInit();
- if ( retcode < 0 ) {
- /* We don't expect them to fail, but... */
- return(-1);
- }
- }
+ retcode = 0;
+ retcode += SDL_AppActiveInit();
+ retcode += SDL_KeyboardInit();
+ retcode += SDL_MouseInit();
+ retcode += SDL_QuitInit();
+ if ( retcode < 0 ) {
+ /* We don't expect them to fail, but... */
+ return(-1);
+ }
+
/* Create the lock and event thread */
if ( SDL_StartEventThread(flags) < 0 ) {
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
