From 8ffe2e87df69ff2ba686296a92291e042e96a4f3 Mon Sep 17 00:00:00 2001 From: kazer_ Date: Tue, 10 Jul 2007 14:00:56 +0000 Subject: [PATCH] Switching to new debugging api git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@294 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- navit/src/gui/sdl/gui_sdl_window.cpp | 30 +++++++++++++++--------------- navit/src/gui/sdl/sdl_events.cpp | 16 ++++++++-------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/navit/src/gui/sdl/gui_sdl_window.cpp b/navit/src/gui/sdl/gui_sdl_window.cpp index 9d103eb..1526b62 100644 --- a/navit/src/gui/sdl/gui_sdl_window.cpp +++ b/navit/src/gui/sdl/gui_sdl_window.cpp @@ -60,7 +60,7 @@ struct navit *sdl_gui_navit; static int gui_sdl_set_graphics(struct gui_priv *this_, struct graphics *gra) { - printf("setting up the graphics\n"); + dbg(1,"setting up the graphics\n"); DLid=(GLuint *)graphics_get_data(gra, "opengl_displaylist"); if (!DLid) @@ -70,7 +70,7 @@ gui_sdl_set_graphics(struct gui_priv *this_, struct graphics *gra) void drawCursor() { - printf("Pushing a cursor from GUI\n"); + dbg(1,"Pushing a cursor from GUI\n"); int x=400; int y=400; float cursor_size=15.0f; @@ -145,7 +145,7 @@ sdl_update_roadbook(struct navigation *nav, void *data) static int gui_run_main_loop(struct gui_priv *this_) { - printf("Entering main loop\n"); + dbg(1,"Entering main loop\n"); bool must_quit = false; @@ -187,10 +187,10 @@ static int gui_run_main_loop(struct gui_priv *this_) struct navigation *navig; navig=navit_get_navigation(sdl_gui_navit); if(navig){ - printf("navig valid, registering callback\n"); + dbg(1,"navig valid, registering callback\n"); navigation_register_callback(navig, navigation_mode_long, callback_new((void (*)())sdl_update_roadbook, 1, (void **)&sdl_gui_navit)); } else { - printf("navig unvalid\n"); + dbg(1,"navig unvalid\n"); } @@ -317,14 +317,14 @@ struct gui_methods gui_sdl_methods = { int init_GL() { - printf("init_GL()\n"); + dbg(1,"init_GL()\n"); // glClearColor(1.0,0.9,0.7,0); // Blue sky glClearColor(0.3,0.7,1.0,0); if(VIEW_MODE==VM_2D){ - printf("Switching to 2D view\n"); + dbg(1,"Switching to 2D view\n"); // myRoot->getChild("OSD/ViewMode")->setText("2D"); glMatrixMode( GL_PROJECTION ); glLoadIdentity(); @@ -334,7 +334,7 @@ int init_GL() { glMatrixMode(GL_MODELVIEW); glLoadIdentity(); } else { - printf("Switching to 3D view\n"); + dbg(1,"Switching to 3D view\n"); // myRoot->getChild("OSD/ViewMode")->setText("3D"); // Dimensions de la fenetre de rendu @@ -642,26 +642,26 @@ static void init_sdlgui(void) static struct gui_priv * gui_sdl_new(struct navit *nav, struct gui_methods *meth, int w, int h) { - printf("Begin SDL init\n"); + dbg(1,"Begin SDL init\n"); struct gui_priv *this_; sdl_gui_navit=nav; if(sdl_gui_navit){ - printf("*** VALID navit instance in gui\n"); + dbg(1,"VALID navit instance in gui\n"); } else { - printf("*** Invalid navit instance in gui\n"); + dbg(1,"Invalid navit instance in gui\n"); } if(nav){ - printf("*** VALID source navit instance in gui\n"); + dbg(1,"VALID source navit instance in gui\n"); } else { - printf("*** Invalid source navit instance in gui\n"); + dbg(1,"Invalid source navit instance in gui\n"); } *meth=gui_sdl_methods; this_=g_new0(struct gui_priv, 1); init_sdlgui(); - printf("End SDL init\n"); + dbg(1,"End SDL init\n"); /* this_->win = gtk_window_new(GTK_WINDOW_TOPLEVEL); @@ -681,6 +681,6 @@ gui_sdl_new(struct navit *nav, struct gui_methods *meth, int w, int h) void plugin_init(void) { - printf("registering sdl plugin\n"); + dbg(1,"registering sdl plugin\n"); plugin_register_gui_type("sdl", gui_sdl_new); } diff --git a/navit/src/gui/sdl/sdl_events.cpp b/navit/src/gui/sdl/sdl_events.cpp index 0d83acf..28650bb 100644 --- a/navit/src/gui/sdl/sdl_events.cpp +++ b/navit/src/gui/sdl/sdl_events.cpp @@ -237,7 +237,7 @@ bool handleMouseEnters(const CEGUI::EventArgs& event) void handle_destination_change(){ - printf("Called handle_destination_change\n"); + dbg(1,"Called handle_destination_change\n"); using namespace CEGUI; extern CEGUI::Window* myRoot; @@ -250,7 +250,7 @@ void handle_destination_change(){ if (SDL_dest.current_search==SRCH_COUNTRY) { - printf("Starting a country search\n"); + dbg(1,"Starting a country search\n"); Editbox* country_edit = static_cast(myRoot->getChild("DestinationWindow")->getChild("DestinationWindow/CountryEditbox")); String content=country_edit->getText(); @@ -281,7 +281,7 @@ void handle_destination_change(){ if(strlen(content.c_str())<4){ } else { - printf("town searching for %s\n",content.c_str()); + dbg(1,"town searching for %s\n",content.c_str()); search->attr.type=attr_town_name; search->attr.u.str=(char *)content.c_str(); @@ -326,7 +326,7 @@ void handle_destination_change(){ if(strlen(content.c_str())<1){ } else { - printf("street searching for %s\n",content.c_str()); + dbg(1,"street searching for %s\n",content.c_str()); search->attr.type=attr_street_name; search->attr.u.str=(char *)content.c_str(); @@ -407,11 +407,11 @@ bool DialogWindowSwitch(const CEGUI::EventArgs& event) } struct search_param *search=&search_param; - printf("search->nav=sdl_gui_navit;\n"); + dbg(1,"search->nav=sdl_gui_navit;\n"); search->nav=sdl_gui_navit; - printf("search->ms=navit_get_mapset(sdl_gui_navit);\n"); + dbg(1,"search->ms=navit_get_mapset(sdl_gui_navit);\n"); search->ms=navit_get_mapset(sdl_gui_navit); - printf("search->sl=search_list_new(search->ms);\n"); + dbg(1,"search->sl=search_list_new(search->ms);\n"); search->sl=search_list_new(search->ms); return true; @@ -502,7 +502,7 @@ bool Handle_Virtual_Key_Down(const CEGUI::EventArgs& event){ if(senderID=="OK"){ - printf("Validating : %s\n",content.c_str()); + dbg(1,"Validating : %s\n",content.c_str()); myRoot->getChild("Navit/Keyboard")->hide(); return 0; } else if(senderID=="BACK"){ -- 2.7.4