blob: e11859b0b80a161eca796ec770d0535a15c4088b (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
diff -up marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp.orig marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
--- marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp.orig 2011-05-20 15:34:41.000000000 -0500
+++ marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp 2011-08-24 13:38:37.050200241 -0500
@@ -20,6 +20,9 @@ using namespace Marble;
GpsdConnection::GpsdConnection( QObject* parent )
: QObject( parent ),
+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
+ m_gpsd("localhost", DEFAULT_GPSD_PORT),
+#endif
m_timer( 0 )
{
m_oldLocale = setlocale( LC_NUMERIC, NULL );
@@ -35,7 +38,11 @@ GpsdConnection::~GpsdConnection()
void GpsdConnection::initialize()
{
m_timer.stop();
+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
+ gps_data_t* data;
+#else
gps_data_t* data = m_gpsd.open();
+#endif
if ( data ) {
m_status = PositionProviderStatusAcquiring;
emit statusChanged( m_status );
@@ -82,8 +89,16 @@ void GpsdConnection::initialize()
void GpsdConnection::update()
{
#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) && defined( PACKET_SET )
+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
+ if ( m_gpsd.waiting(0) ) {
+#else
if ( m_gpsd.waiting() ) {
+#endif
+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
+ gps_data_t* data = m_gpsd.read();
+#else
gps_data_t* data = m_gpsd.poll();
+#endif
if ( data && data->set & PACKET_SET ) {
emit gpsdInfo( *data );
}
|
