diff options
Diffstat (limited to 'navit/graphics/sdl/event_sdl.c')
-rw-r--r-- | navit/graphics/sdl/event_sdl.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/navit/graphics/sdl/event_sdl.c b/navit/graphics/sdl/event_sdl.c index 28fe4fafb..d60c2d04c 100644 --- a/navit/graphics/sdl/event_sdl.c +++ b/navit/graphics/sdl/event_sdl.c @@ -48,7 +48,7 @@ sdl_timer_callback(Uint32 interval, void* param) { struct event_timeout *timeout=(struct event_timeout*)param; - dbg(lvl_debug,"timer(%p) multi(%d) interval(%d) fired\n", param, timeout->multi, interval); + dbg(lvl_debug,"timer(%p) multi(%d) interval(%d) fired", param, timeout->multi, interval); SDL_Event event; SDL_UserEvent userevent; @@ -104,7 +104,7 @@ event_sdl_watch_thread (GPtrArray *watch_list) for (idx = 0; idx < watch_list->len; idx++ ) { if (pfds[idx].revents == pfds[idx].events) { /* The requested event happened, notify mainloop! */ ew = g_ptr_array_index (watch_list, idx); - dbg(lvl_debug,"watch(%p) event(%d) encountered\n", ew, pfds[idx].revents); + dbg(lvl_debug,"watch(%p) event(%d) encountered", ew, pfds[idx].revents); SDL_Event event; SDL_UserEvent userevent; @@ -130,7 +130,7 @@ event_sdl_watch_thread (GPtrArray *watch_list) static void event_sdl_watch_startthread(GPtrArray *watch_list) { - dbg(lvl_debug,"enter\n"); + dbg(lvl_debug,"enter"); if (sdl_watch_thread) event_sdl_watch_stopthread(); @@ -143,7 +143,7 @@ event_sdl_watch_startthread(GPtrArray *watch_list) static void event_sdl_watch_stopthread() { - dbg(lvl_debug,"enter\n"); + dbg(lvl_debug,"enter"); if (sdl_watch_thread) { /* Notify the watch thread that the list of FDs will change */ pthread_kill(sdl_watch_thread, SIGUSR1); @@ -155,7 +155,7 @@ event_sdl_watch_stopthread() static struct event_watch * event_sdl_add_watch(int fd, enum event_watch_cond cond, struct callback *cb) { - dbg(lvl_debug,"fd(%d) cond(%x) cb(%x)\n", fd, cond, cb); + dbg(lvl_debug,"fd(%d) cond(%x) cb(%x)", fd, cond, cb); event_sdl_watch_stopthread(); @@ -193,7 +193,7 @@ event_sdl_add_watch(int fd, enum event_watch_cond cond, struct callback *cb) static void event_sdl_remove_watch(struct event_watch *ew) { - dbg(lvl_debug,"enter %p\n",ew); + dbg(lvl_debug,"enter %p",ew); event_sdl_watch_stopthread(); @@ -212,10 +212,10 @@ event_sdl_add_timeout(int timeout, int multi, struct callback *cb) { struct event_timeout * ret = g_new0(struct event_timeout, 1); if(!ret) { - dbg(lvl_error,"g_new0 failed\n"); + dbg(lvl_error,"g_new0 failed"); return ret; } - dbg(lvl_debug,"timer(%p) multi(%d) interval(%d) cb(%p) added\n",ret, multi, timeout, cb); + dbg(lvl_debug,"timer(%p) multi(%d) interval(%d) cb(%p) added",ret, multi, timeout, cb); ret->multi = multi; ret->cb = cb; ret->id = SDL_AddTimer(timeout, sdl_timer_callback, ret); @@ -226,17 +226,17 @@ event_sdl_add_timeout(int timeout, int multi, struct callback *cb) static void event_sdl_remove_timeout(struct event_timeout *to) { - dbg(lvl_info,"enter %p\n", to); + dbg(lvl_info,"enter %p", to); if(to) { /* do not SDL_RemoveTimer if oneshot timer has already fired */ int ret = to->id == 0 ? SDL_TRUE : SDL_RemoveTimer(to->id); if (ret == SDL_FALSE) - dbg(lvl_error,"SDL_RemoveTimer (%p) failed\n", to->id); + dbg(lvl_error,"SDL_RemoveTimer (%p) failed", to->id); g_free(to); - dbg(lvl_debug,"timer(%p) removed\n", to); + dbg(lvl_debug,"timer(%p) removed", to); } } @@ -258,7 +258,7 @@ sdl_sort_idle_tasks(gconstpointer parama, gconstpointer paramb) static struct event_idle * event_sdl_add_idle(int priority, struct callback *cb) { - dbg(lvl_debug,"add idle priority(%d) cb(%p)\n", priority, cb); + dbg(lvl_debug,"add idle priority(%d) cb(%p)", priority, cb); struct idle_task *task = g_new0(struct idle_task, 1); task->priority = priority; @@ -271,7 +271,7 @@ event_sdl_add_idle(int priority, struct callback *cb) SDL_Event event; SDL_UserEvent userevent; - dbg(lvl_debug,"poking eventloop because of new idle_events\n"); + dbg(lvl_debug,"poking eventloop because of new idle_events"); userevent.type = SDL_USEREVENT; userevent.code = SDL_USEREVENT_CODE_IDLE_EVENT; @@ -292,7 +292,7 @@ event_sdl_add_idle(int priority, struct callback *cb) static void event_sdl_remove_idle(struct event_idle *task) { - dbg(lvl_debug,"remove task(%p)\n", task); + dbg(lvl_debug,"remove task(%p)", task); g_ptr_array_remove(idle_tasks, (gpointer)task); } @@ -301,7 +301,7 @@ event_sdl_remove_idle(struct event_idle *task) static void event_sdl_call_callback(struct callback_list *cbl) { - dbg(lvl_debug,"call_callback cbl(%p)\n",cbl); + dbg(lvl_debug,"call_callback cbl(%p)",cbl); SDL_Event event; SDL_UserEvent userevent; |