Diff of /trunk/src/gpxview.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 281 by harbaum, Fri May 21 19:28:16 2010 UTC revision 282 by harbaum, Wed May 26 19:21:47 2010 UTC
# Line 87  Line 87 
87  /* all include appdata_t relies on go here ... */  /* all include appdata_t relies on go here ... */
88  #include "gpx.h"  #include "gpx.h"
89  #include "settings.h"  #include "settings.h"
90    #include "gps.h"
91    
92  #define GPXLIST_ITEM_VALID    (1<<0)  #define GPXLIST_ITEM_VALID    (1<<0)
93  #define GPXLIST_ITEM_DATE     (1<<1)  #define GPXLIST_ITEM_DATE     (1<<1)
# Line 110  typedef struct { Line 111  typedef struct {
111    
112    gboolean imperial;          /* display imperial units */    gboolean imperial;          /* display imperial units */
113    
   pos_t gps;                  /* saved last gps position */  
   
114    char *image_path;           /* path to cache images in */    char *image_path;           /* path to cache images in */
115    
116    int search;                 /* "search in" items */    int search;                 /* "search in" items */
# Line 245  typedef struct { Line 244  typedef struct {
244  #ifndef USE_STACKABLE_WINDOW  #ifndef USE_STACKABLE_WINDOW
245    GtkWidget *vbox;    GtkWidget *vbox;
246  #endif  #endif
247    
248      struct {
249        gps_mask_t set;
250        struct gps_t fix;
251        pos_t saved;                  /* saved last gps position */
252      } gps;
253    
254  } appdata_t;  } appdata_t;
255    
256  /* all includes that rely on appdata_t go here ... */  /* all includes that rely on appdata_t go here ... */
 #include "gps.h"  
257  #include "goto.h"  #include "goto.h"
258  #include "gconf.h"  #include "gconf.h"
259  #include "html.h"  #include "html.h"
# Line 310  void gpxlist_set(GtkListStore *store, Gt Line 315  void gpxlist_set(GtkListStore *store, Gt
315  void gpxlist_add(appdata_t *appdata, gpx_t *new);  void gpxlist_add(appdata_t *appdata, gpx_t *new);
316  void cachelist_redraw(appdata_t *appdata);  void cachelist_redraw(appdata_t *appdata);
317    
318    /* interface to main windows gps callback */
319    pos_t *gps_get_pos(appdata_t *appdata);
320    float gps_get_heading(appdata_t *appdata);
321    gint gps_get_satnum(appdata_t *appdata);
322    gps_sat_t *gps_get_sats(appdata_t *appdata);
323    float gps_get_eph(appdata_t *appdata);
324    void gps_change_state(appdata_t *appdata);
325    
326  #endif // GPXVIEW_H  #endif // GPXVIEW_H
Legend:
Removed from v.281  
changed lines
  Added in v.282