Revision: 7070
http://playerstage.svn.sourceforge.net/playerstage/?rev=7070&view=rev
Author: gbiggs
Date: 2008-10-07 01:06:39 +0000 (Tue, 07 Oct 2008)
Log Message:
-----------
Applied patch 2145002
Modified Paths:
--------------
code/player/branches/release-2-1-patches/server/drivers/gps/garminnmea.cc
code/player/branches/release-2-1-patches/server/libplayerdrivers/driverregistry.cc
Modified:
code/player/branches/release-2-1-patches/server/drivers/gps/garminnmea.cc
===================================================================
--- code/player/branches/release-2-1-patches/server/drivers/gps/garminnmea.cc
2008-10-07 00:56:12 UTC (rev 7069)
+++ code/player/branches/release-2-1-patches/server/drivers/gps/garminnmea.cc
2008-10-07 01:06:39 UTC (rev 7070)
@@ -1012,6 +1012,7 @@
char tmp[8];
struct tm tms;
time_t utc;
+ static bool short_time_field = 0;
//printf("got RMC (%s)\n", buf);
//fflush(stdout);
@@ -1023,9 +1024,17 @@
if (strlen(field) < 6)
{
- PLAYER_WARN("short time field; ignoring");
+ /* This can happen while indoors. Prevent the screen from being flooded
+ with these messages */
+ if (!short_time_field)
+ {
+ PLAYER_WARN("short time field; ignoring");
+ short_time_field = 1;
+ }
return -1;
}
+ /* else */
+ short_time_field = 0;
// first field is time of day. HHMMSS
strncpy(tmp,field,2);
Modified:
code/player/branches/release-2-1-patches/server/libplayerdrivers/driverregistry.cc
===================================================================
---
code/player/branches/release-2-1-patches/server/libplayerdrivers/driverregistry.cc
2008-10-07 00:56:12 UTC (rev 7069)
+++
code/player/branches/release-2-1-patches/server/libplayerdrivers/driverregistry.cc
2008-10-07 01:06:39 UTC (rev 7070)
@@ -436,7 +436,7 @@
#endif
#ifdef INCLUDE_FAKELOCALIZE
-void FakeLocalize_Register(DriverTable* table);
+void fakelocalize_Register(DriverTable* table);
#endif
#ifdef INCLUDE_STAGECLIENT
@@ -909,7 +909,7 @@
#endif
#ifdef INCLUDE_FAKELOCALIZE
- FakeLocalize_Register(driverTable);
+ fakelocalize_Register(driverTable);
#endif
#ifdef INCLUDE_NOMAD
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
