Moved lots of UI stuff to ui.c.

[speedometer] / callbacks.c

diff --git a/callbacks.c b/callbacks.c
index f8e29ff..704f102 100644 (file)
--- a/callbacks.c
+++ b/callbacks.c
@@ -16,23 +16,18 @@
        along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ****/
 
-#include <math.h>
 #include <hildon/hildon-banner.h>
+#include <math.h>
 
 #include "callbacks.h"
 #include "appdata.h"
-#include "util.h"
+#include "ui.h"
 
 void location_changed(LocationGPSDevice* device, gpointer data) {
-       g_assert(data);
-       g_assert(device);
-
-       AppData* appdata = (AppData*) data;
-
        // check for NaN before passing values
        if(device->fix->fields & LOCATION_GPS_DEVICE_SPEED_SET) {
                if(!isnan(device->fix->speed)) {
-                       interpret_speed_from_gps(appdata, device->fix->speed);
+                       interpret_and_set_speed(device->fix->speed);
                        }
        }
 }
@@ -80,6 +75,8 @@ gboolean key_press_cb(GtkWidget* widget, GdkEventKey* event, HildonWindow* windo
 }
 
 gboolean top_event_box_button_press(GtkWidget* widget, GdkEventButton* event, gpointer data) {
+       g_assert(data);
+
        gdouble x = event->x;
        g_print("Top event box pressed at: %f\n", x);
        AppData* appdata = (AppData*) data;
@@ -91,6 +88,12 @@ gboolean top_event_box_button_press(GtkWidget* widget, GdkEventButton* event, gp
        return TRUE;
 }
 
+gboolean middle_event_box_button_press(GtkWidget* widget, GdkEventButton* event, gpointer data) {
+       gdouble x = event->x;
+       g_print("Middle event box pressed at: %f\n", x);
+       g_print("TODO: change multiplier\n");
+       return TRUE;
+}
 
 gboolean bottom_event_box_button_press(GtkWidget* widget, GdkEventButton* event, gpointer data) {
        gdouble x = event->x;