summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Spilsbury <Sam@XPS-SUSE.site>2008-09-10 21:32:38 +0800
committerSam Spilsbury <Sam@XPS-SUSE.site>2008-09-10 21:32:38 +0800
commitfb332e0b727fe93acf6e60532ee0093f426810d0 (patch)
tree825c611f627dffa85139f21f25f799851c39c977
parent8c26079a7c8e099c04040cf719912e9c93f5d007 (diff)
downloadwiimote-fb332e0b727fe93acf6e60532ee0093f426810d0.tar.gz
wiimote-fb332e0b727fe93acf6e60532ee0093f426810d0.tar.bz2
* ABI Update
-rw-r--r--action.c8
-rw-r--r--communicate.c4
-rw-r--r--connect.c20
-rw-r--r--option.c2
4 files changed, 17 insertions, 17 deletions
diff --git a/action.c b/action.c
index b44379c..2ad0bfa 100644
--- a/action.c
+++ b/action.c
@@ -80,7 +80,7 @@ wiimoteToggle (CompDisplay *d,
sendInfoToPlugin (d, arg, nArg,
"prompt",
"display_text");
- compLogMessage (d, "wiimote", CompLogLevelInfo,
+ compLogMessage ("wiimote", CompLogLevelInfo,
"Hold down the 1 and 2 Buttons on your Nintendo Wii Remote now");
/* Create the second thread. */
rc = pthread_create(&ad->cWiimote[ad->nWiimote].connectWiimote, &secondThreadAttr, connectWiimote, (void *)d);
@@ -124,7 +124,7 @@ wiimoteDisable (CompDisplay *d,
rc = pthread_join(ad->cWiimote[ad->nWiimote -1].connectWiimote, NULL);
if (rc)
- compLogMessage (d, "wiimote", CompLogLevelError,
+ compLogMessage ("wiimote", CompLogLevelError,
"Threading error occurred.\n");
/* Remove timeout handles */
@@ -142,10 +142,10 @@ wiimoteDisable (CompDisplay *d,
/* Tell the user that we are closing the connection */
- compLogMessage (d, "wiimote", CompLogLevelInfo,
+ compLogMessage ("wiimote", CompLogLevelInfo,
"Closing connection to most recently connected Wii Remote\n");
if (cwiid_close(ad->cWiimote[ad->nWiimote - 1].wiimote)) {
- compLogMessage (d, "wiimote", CompLogLevelError,
+ compLogMessage ("wiimote", CompLogLevelError,
"Error closing that connection\n");
return -1;
}
diff --git a/communicate.c b/communicate.c
index 187596d..d1b4ba1 100644
--- a/communicate.c
+++ b/communicate.c
@@ -39,7 +39,7 @@ sendInfoToPlugin (CompDisplay *d, CompOption *argument, int nArgument, char *plu
if (!p || !p->vTable->getObjectOptions)
{
- compLogMessage (d, "wiimote", CompLogLevelError,
+ compLogMessage ("wiimote", CompLogLevelError,
"Reporting plugin '%s' does not exist!", pluginName);
return FALSE;
}
@@ -63,7 +63,7 @@ sendInfoToPlugin (CompDisplay *d, CompOption *argument, int nArgument, char *plu
}
else
{
- compLogMessage (d, "wiimote", CompLogLevelError,
+ compLogMessage ("wiimote", CompLogLevelError,
"Plugin '%s' does exist, but no option named '%s' was found!", pluginName, actionName);
return FALSE;
}
diff --git a/connect.c b/connect.c
index df87301..4c903a7 100644
--- a/connect.c
+++ b/connect.c
@@ -95,7 +95,7 @@ void* connectWiimote (void *vd)
if (!find_wiimote(&bdaddr, 2))
{
- compLogMessage (d, "wiimote", CompLogLevelError,
+ compLogMessage ("wiimote", CompLogLevelError,
"Wii Remote not found");
for (s = d->screens; s; s = s->next)
@@ -161,7 +161,7 @@ void* connectWiimote (void *vd)
"display_text");
}
if (!(wiimote = cwiid_open(&bdaddr, 0))) {
- compLogMessage (d, "wiimote", CompLogLevelError,
+ compLogMessage ("wiimote", CompLogLevelError,
"Could not connect to Wii Remote");
return NULL;
@@ -232,18 +232,18 @@ Bool checkConnected (void *vd)
if (ad->cWiimote[ad->nWiimote].connected)
{
/* Connect to the wiimote */
- compLogMessage (d, "wiimote", CompLogLevelInfo,
+ compLogMessage ("wiimote", CompLogLevelInfo,
"Wii Remote Connection started");
if (allocateCallbackFunction
(ad->cWiimote[ad->nWiimote].wiimote, ad->nWiimote)) // Allocate a c
{
- compLogMessage (d, "wiimote", CompLogLevelInfo,
+ compLogMessage ("wiimote", CompLogLevelInfo,
"Wii Remote is now connected");
if (cwiid_set_rumble(ad->cWiimote[0].wiimote, rumble)) {
- compLogMessage (d, "wiimote", CompLogLevelError,
+ compLogMessage ("wiimote", CompLogLevelError,
"Couldn't set rumble");
}
@@ -288,7 +288,7 @@ Bool checkConnected (void *vd)
/* FIXME !mesg is here unconditionally true */
if (!mesg) {
if (cwiid_enable(ad->cWiimote[ad->nWiimote].wiimote, CWIID_FLAG_MESG_IFC)) {
- compLogMessage (d, "wiimote", CompLogLevelError,
+ compLogMessage ("wiimote", CompLogLevelError,
"Couldn't set messages. Wii remote will connect, but reporting and other things won't work!");
}
else {
@@ -297,7 +297,7 @@ Bool checkConnected (void *vd)
}
else {
if (cwiid_disable(ad->cWiimote[ad->nWiimote].wiimote, CWIID_FLAG_MESG_IFC)) {
- compLogMessage (d, "wiimote", CompLogLevelError,
+ compLogMessage ("wiimote", CompLogLevelError,
"Couldn't disable messages");
}
else {
@@ -308,14 +308,14 @@ Bool checkConnected (void *vd)
/* Request Status */
if (cwiid_request_status(ad->cWiimote[ad->nWiimote].wiimote)) {
- compLogMessage (d, "wiimote", CompLogLevelError,
+ compLogMessage ("wiimote", CompLogLevelError,
"Error requesting status. Battery info will not work!");
}
/* Request State */
if (cwiid_get_state(ad->cWiimote[ad->nWiimote].wiimote, &state)) {
- compLogMessage (d, "wiimote", CompLogLevelError,
+ compLogMessage ("wiimote", CompLogLevelError,
"Error requesting state. Calibration will not work!");
}
@@ -359,7 +359,7 @@ Bool checkConnected (void *vd)
}
else
{
- compLogMessage (d, "wiimote", CompLogLevelError,
+ compLogMessage ("wiimote", CompLogLevelError,
"Maximum number of Wii Remotes reached. If you want to enable more,"\
"change the macro MAX_WIIMOTES in wiimote.c. This will be fixed in "\
"the future with actual memory allocation");
diff --git a/option.c b/option.c
index 54a7225..f03e003 100644
--- a/option.c
+++ b/option.c
@@ -103,7 +103,7 @@ reloadWiimoteReporters(CompDisplay *d)
(cWiimoteNumber->nValue != cDataType->nValue) ||
(cWiimoteNumber->nValue != cReportSensitivity->nValue))
{
- compLogMessage (d, "wiimote", CompLogLevelError,
+ compLogMessage ("wiimote", CompLogLevelError,
"Options are not set correctly. Please revisit them and make sure each option in the list is set\n");
return;
}