Cleanup

[speedometer] / callbacks.c

diff --git a/callbacks.c b/callbacks.c
index 57964cb..bb6dbda 100644 (file)
--- a/callbacks.c
+++ b/callbacks.c
@@ -14,32 +14,22 @@
 
        You should have received a copy of the GNU General Public License
        along with this program.  If not, see <http://www.gnu.org/licenses/>.
-****/
+ ****/
+
+#include <hildon/hildon-banner.h>
+#include <math.h>
+#include <glib.h>
 
 #include "callbacks.h"
 #include "appdata.h"
-#include "util.h"
-
-// this is just here for debugging
-static void print_location(LocationGPSDevice* device) {
-       g_print("Latitude: %.2f\n"
-                       "Longitude: %.2f\n"
-                       "Altitude: %.2f\n"
-                       "Speed: %d\n",
-                       device->fix->latitude,
-                       device->fix->longitude,
-                       device->fix->altitude,
-                       device->fix->speed);
-}
+#include "ui.h"
 
 void location_changed(LocationGPSDevice* device, gpointer data) {
-       //print_location(device);
-
-       AppData* appdata = (AppData*) data;
-
+       // check for NaN before passing values
        if(device->fix->fields & LOCATION_GPS_DEVICE_SPEED_SET) {
-               g_print("Speed is %.2f km/h\n", device->fix->speed);
-               interpret_speed_from_gps(appdata, device->fix->speed);
+               if(!isnan(device->fix->speed)) {
+                       interpret_and_set_speed(device->fix->speed);
+               }
        }
 }
 
@@ -85,29 +75,12 @@ gboolean key_press_cb(GtkWidget* widget, GdkEventKey* event, HildonWindow* windo
        return FALSE;
 }
 
-gboolean top_event_box_button_press(GtkWidget* widget, GdkEventButton* event, gpointer data) {
-       gdouble x = event->x;
-       g_print("Top event box pressed at: %f\n", x);
-       AppData* appdata = (AppData*) data;
-
-       if(x > 750) {
-               g_print("Exiting..\n");
-               stop_gps(appdata);
-               g_signal_emit_by_name(appdata->window, "delete_event");
-       }
-       else {
-               randomize(appdata);
-       }
+gboolean long_tap(GtkWidget* widget, gpointer data) {
+       gtk_main_quit();
        return TRUE;
 }
 
-
-gboolean bottom_event_box_button_press(GtkWidget* widget, GdkEventButton* event, gpointer data) {
-       gdouble x = event->x;
-       g_print("Bottom event box pressed at: %f\n", x);
-       AppData* appdata = (AppData*) data;
-
-       randomize(data);
+gboolean short_tap(GtkWidget* widget, GdkEventButton* event, gpointer data) {
+       change_unit();
        return TRUE;
 }
-