Author: ayoung
Date: Sun Oct 3 05:04:45 2010
New Revision: 9147
URL: http://svn.slimdevices.com/jive?rev=9147&view=rev
Log:
task : SN test harness
We still need the event-loop even when we have no Video and are are not using
SDL Timers.
Modified:
7.6/trunk/squeezeplay/src/SDL-1.2.13/include/SDL.h
7.6/trunk/squeezeplay/src/SDL-1.2.13/src/SDL.c
7.6/trunk/squeezeplay/src/squeezeplay/src/ui/jive_framework.c
Modified: 7.6/trunk/squeezeplay/src/SDL-1.2.13/include/SDL.h
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/SDL-1.2.13/include/SDL.h?rev=9147&r1=9146&r2=9147&view=diff
==============================================================================
--- 7.6/trunk/squeezeplay/src/SDL-1.2.13/include/SDL.h (original)
+++ 7.6/trunk/squeezeplay/src/SDL-1.2.13/include/SDL.h Sun Oct 3 05:04:45 2010
@@ -57,6 +57,7 @@
#define SDL_INIT_VIDEO 0x00000020
#define SDL_INIT_CDROM 0x00000100
#define SDL_INIT_JOYSTICK 0x00000200
+#define SDL_INIT_EVENTLOOP 0x00000400
#define SDL_INIT_NOPARACHUTE 0x00100000 /* Don't catch fatal signals */
#define SDL_INIT_EVENTTHREAD 0x01000000 /* Not supported on all OS's */
#define SDL_INIT_EVERYTHING 0x0000FFFF
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=9147&r1=9146&r2=9147&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 Sun Oct 3 05:04:45 2010
@@ -95,6 +95,17 @@
}
#endif
+
+ /* if we have want the event loop but no Video then we still need the
event loop */
+ if (!(flags & SDL_INIT_VIDEO) && (flags & SDL_INIT_EVENTLOOP)) {
+ /* Start the event loop */
+ if ( SDL_StartEventLoop(flags) < 0 ) {
+ return(-1);
+ }
+ SDL_initialized |= SDL_INIT_EVENTLOOP;
+ }
+
+
#if !SDL_TIMERS_DISABLED
/* Initialize the timer subsystem */
if ( ! ticks_started ) {
@@ -106,15 +117,6 @@
return(-1);
}
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/squeezeplay/src/ui/jive_framework.c
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/src/ui/jive_framework.c?rev=9147&r1=9146&r2=9147&view=diff
==============================================================================
--- 7.6/trunk/squeezeplay/src/squeezeplay/src/ui/jive_framework.c (original)
+++ 7.6/trunk/squeezeplay/src/squeezeplay/src/ui/jive_framework.c Sun Oct 3
05:04:45 2010
@@ -165,7 +165,7 @@
SDL_putenv("SDL_NOMOUSE=1");
#ifdef JIVE_NO_DISPLAY
-# define JIVE_SDL_FEATURES (0)
+# define JIVE_SDL_FEATURES (SDL_INIT_EVENTLOOP)
#else
# define JIVE_SDL_FEATURES (SDL_INIT_VIDEO)
#endif
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
