Changeset 116 for trunk/wmgui

Timestamp:

05/16/07 19:40:30 (2 years ago)

Author:

dsmith

Message:

deprecated cwiid_{connect,disconnect,command}, added cwiid_{open,close,request_status,set_led,set_rumble,set_rpt_mode}

Files:

• trunk/wmgui/main.c (modified) (8 diffs)

trunk/wmgui/main.c

@@ -16 +16 @@
- *
- *  ChangeLog:
+ *  2007-05-16 L. Donnie Smith <cwiid@abstrakraft.org>
+ *  * changed cwiid_{connect,disconnect,command} to
+ *    cwiid_{open,close,request_status|set_led|set_rumble|set_rpt_mode}
+ *
- *  2007-05-14 L. Donnie Smith <cwiid@abstrakraft.org>
- *  * added timestamp to message callback
@@ -635 +639 @@
-                "Put Wiimote in discoverable mode (press 1+2) and press OK",
-                 GTK_WINDOW(winMain));
-connect
+open
-                message(GTK_MESSAGE_ERROR, "Unable to connect", GTK_WINDOW(winMain));
-                status("No connection");
@@ -642 +646 @@
-                message(GTK_MESSAGE_ERROR, "Error setting callback",
-                        GTK_WINDOW(winMain));
-disconnect
+close
-                        message(GTK_MESSAGE_ERROR, "Error on disconnect",
-                                GTK_WINDOW(winMain));
@@ -657 +661 @@
-                set_gui_state();
-                set_report_mode();
-command(wiimote, CWIID_CMD_STATUS, 0
+request_status(wiimote
-        }
-
@@ -667 +671 @@
-void menuDisconnect_activate(void)
-{
-disconnect
+close
-                message(GTK_MESSAGE_ERROR, "Error on disconnect", GTK_WINDOW(winMain));
-        }
@@ -747 +751 @@
-                  (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(chkLED4))
-                    ? CWIID_LED4_ON : 0);
-command(wiimote, CWIID_CMD_LED
+set_led(wiimote
-                        message(GTK_MESSAGE_ERROR, "error setting LEDs",
-                                GTK_WINDOW(winMain));
@@ -757 +761 @@
-{
-        if (wiimote) {
-command(wiimote, CWIID_CMD_RUMBLE
+set_rumble(wiimote
-                  gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(chkRumble)))) {
-                        message(GTK_MESSAGE_ERROR, "error setting rumble",
@@ -997 +1001 @@
-                rpt_mode |= CWIID_RPT_EXT;
-        }
-command(wiimote, CWIID_CMD_RPT_MODE
+set_rpt_mode(wiimote
-                message(GTK_MESSAGE_ERROR, "error setting report mode",
-                        GTK_WINDOW(winMain));