This email list is read-only. Emails sent to this list will be discarded
----------------------------------
ChangeLog | 9 +
configure.in | 2 +-
moblin-system-daemon/Makefile.am | 2 +-
moblin-system-daemon/datetime/datetime.c | 8 +-
moblin-system-daemon/moblin-system-tool.c | 364 +++++++++++++++++++++++++++++
moblin-system-daemon/sound/sound.c | 16 +-
6 files changed, 390 insertions(+), 11 deletions(-)
New commits:
commit dcf90421e3673bbfdcec888443536b09ed165104
Author: Todd Brandt <[EMAIL PROTECTED]>
Date: Tue Aug 12 09:44:44 2008 -0700
Fixed up the moblin-system-tool
Diff in this email is a maximum of 400 lines.
diff --git a/ChangeLog b/ChangeLog
index 1af936b..e6dc6de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+moblin-settings (2.12)
+
+ * Added LCD Backlight controls to the moblin-system-tool
+ * moved the definition of LOGDEBUG to configure.in so that
+ it would cover all source. It was formerly in the moblin-system-daemon
+ Makefile.am which didn't cover any of the modules.
+
+ -- Todd Brandt <[EMAIL PROTECTED]> Tue Aug 12 09:43:30 PDT 2008
+
moblin-settings (2.11)
* Added in Lilli's changes to the datetime module and fixed a few
diff --git a/configure.in b/configure.in
index c36b1c4..7cc0f73 100644
--- a/configure.in
+++ b/configure.in
@@ -22,7 +22,7 @@ AC_LANG_COMPILER_REQUIRE
CFLAGS="$CFLAGS -Werror"
if test "x${use_debug}" = "xyes"
then
- CFLAGS="$CFLAGS -ggdb -O0 -DDEBUG"
+ CFLAGS="$CFLAGS -ggdb -O0 -DDEBUG -DLOGDEBUG"
else
CFLAGS="$CFLAGS -O2"
fi
diff --git a/moblin-system-daemon/Makefile.am b/moblin-system-daemon/Makefile.am
index 7c4ad8f..961f9ed 100644
--- a/moblin-system-daemon/Makefile.am
+++ b/moblin-system-daemon/Makefile.am
@@ -4,7 +4,7 @@ DIST_SUBDIRS =
bin_PROGRAMS=moblin-system-tool
sbin_PROGRAMS=moblin-system-daemon
-INCLUDES= $(MOBLIN_SYSTEM_DAEMON_CFLAGS) -DLOGDEBUG
+INCLUDES= $(MOBLIN_SYSTEM_DAEMON_CFLAGS)
moblin_system_tool_SOURCES = moblin-system-tool.c
moblin_system_tool_LDADD = $(MOBLIN_SYSTEM_DAEMON_LIBS)
diff --git a/moblin-system-daemon/datetime/datetime.c
b/moblin-system-daemon/datetime/datetime.c
index 493e834..8a7fe38 100644
--- a/moblin-system-daemon/datetime/datetime.c
+++ b/moblin-system-daemon/datetime/datetime.c
@@ -163,7 +163,7 @@ system_daemon_set_time(MoblinSystemServer * server,
return FALSE;
}
- PRINTF("[system_daemon_set_time] mktime successful:\n\tepoch = %d\n",
timev->tv_sec);
+ PRINTF("[system_daemon_set_time] mktime successful:\n\tepoch = %d\n",
(int)timev->tv_sec);
// This function does not support milliseconds
timev->tv_usec = 0;
@@ -217,7 +217,7 @@ system_daemon_get_time(MoblinSystemServer * server,
return FALSE;
}
- PRINTF("[system_daemon_get_time] gettimeofday successful:\n\tepoch =
%d\n", timev.tv_sec);
+ PRINTF("[system_daemon_get_time] gettimeofday successful:\n\tepoch =
%d\n", (int)timev.tv_sec);
getTime = localtime(&timev.tv_sec);
@@ -299,7 +299,7 @@ system_daemon_get_all_timezones(MoblinSystemServer * server,
return FALSE;
}
- PRINTF("[system_daemon_get_all_timezones] fseek/ftell
successful:\n\tfile length = %d\n", fileLen);
+ PRINTF("[system_daemon_get_all_timezones] fseek/ftell
successful:\n\tfile length = %d\n", (int)fileLen);
//PRINTF("allocating buffer and zones\n");
buffer = (char*)malloc(sizeof(char) * fileLen);
@@ -510,7 +510,7 @@ system_daemon_set_timezone(MoblinSystemServer * server,
return FALSE;
}
- PRINTF("[system_daemon_set_timezone] symlink successful:\n\tTimezone
configured.\n", strerror(errno));
+ PRINTF("[system_daemon_set_timezone] symlink successful:\n\tTimezone
configured.\n");
free(newPath);
newPath = NULL;
diff --git a/moblin-system-daemon/moblin-system-tool.c
b/moblin-system-daemon/moblin-system-tool.c
index 09a5f12..14f55ca 100644
--- a/moblin-system-daemon/moblin-system-tool.c
+++ b/moblin-system-daemon/moblin-system-tool.c
@@ -107,7 +107,28 @@ int main(int argc, char *argv[])
{
printf("Usage: %s <cmd> <args>\n", argv[0]);
printf("Commands:\n");
+#ifdef HAVE_SOUND
+ printf("SOUND\n");
+ printf("\tsound_num_elements\n");
+ printf("\tsound_num_channels <elemidx>\n");
+ printf("\tsound_element_name <elemidx>\n");
+ printf("\tsound_channel_name <elemidx> <chanidx>\n");
+ printf("\tsound_volume_range <elemidx>\n");
+ printf("\tsound_get_volume <elemidx> <chanidx>\n");
+ printf("\tsound_set_volume <elemidx> <chanidx> <vol>\n");
+ printf("\tsound_set_element_volume <elemidx> <vol>\n");
+ printf("\tsound_get_mute <elemidx> <chanidx>\n");
+ printf("\tsound_set_mute <elemidx> <chanidx> <0or1>\n");
+ printf("\tsound_set_element_mute <elemidx> <0or1>\n");
+ printf("\tsound_set_all_mute <0or1>\n");
+ printf("\tsound_get_playback_master\n");
+ printf("\tsound_set_playback_master <elemidx>\n");
+ printf("\tsound_get_record_master\n");
+ printf("\tsound_set_record_master <elemidx>\n");
+ printf("\tsound_capabilities <elemidx>\n");
+#endif
#ifdef HAVE_DATETIME
+ printf("DATE & TIME\n");
printf("\tget_time\n");
printf("\tset_time <MM/DD/YYYY_hh:mm:ss>\n");
printf("\tget_timezone\n");
@@ -115,12 +136,20 @@ int main(int argc, char *argv[])
printf("\tset_timezone <region/zone>\n");
#endif
#ifdef HAVE_TOUCHSCREEN
+ printf("TOUCHSCREEN\n");
printf("\tcapture_touch\n");
printf("\tread_calibration\n");
#endif
#ifdef HAVE_BATTERY
+ printf("BATTERY\n");
printf("\tget_battery_status\n");
#endif
+#ifdef HAVE_LCDBACKLIGHT
+ printf("LCDBACKLIGHT\n");
+ printf("\tget_lcdbacklight_numlevels\n");
+ printf("\tget_lcdbacklight_brightness\n");
+ printf("\tset_lcdbacklight_brightness <value>\n");
+#endif
return 0;
}
@@ -269,5 +298,340 @@ int main(int argc, char *argv[])
printf("\tSeconds Remaining = %d\n", seconds_remaining);
}
#endif
+#ifdef HAVE_SOUND
+ if(!strcmp(argv[1], "sound_num_elements")) {
+ gint num_elements;
+ if(!org_moblin_SystemDaemon_sound_num_elements(proxy,
+ &num_elements, &gerror))
+ {
+ g_warning ("error: %s", gerror->message);
+ g_error_free (gerror);
+ return -1;
+ }
+ printf("%d elements found\n", num_elements);
+ } else if(!strcmp(argv[1], "sound_num_channels")) {
+ gint element=0, num_channels=0;
+ if((argc < 3)||(sscanf(argv[2], "%d", &element) != 1))
+ {
+ fprintf(stderr,
+ "Usage: %s sound_num_channels <elementid>\n",
+ argv[0]);
+ return -1;
+ }
+ if(!org_moblin_SystemDaemon_sound_num_channels(proxy,
+ element, &num_channels, &gerror))
+ {
+ g_warning ("error: %s", gerror->message);
+ g_error_free (gerror);
+ return -1;
+ }
+ printf("%d channels found for element %d\n",
+ num_channels, element);
+ } else if(!strcmp(argv[1], "sound_element_name")) {
+ gint element=0;
+ gchar *name;
+ if((argc < 3)||(sscanf(argv[2], "%d", &element) != 1))
+ {
+ fprintf(stderr,
+ "Usage: %s sound_element_name <elementid>\n",
+ argv[0]);
+ return -1;
+ }
+ if(!org_moblin_SystemDaemon_sound_element_name(proxy,
+ element, &name, &gerror))
+ {
+ g_warning ("error: %s", gerror->message);
+ g_error_free (gerror);
+ return -1;
+ }
+ printf("element %d is named %s\n", element, name);
+ } else if(!strcmp(argv[1], "sound_channel_name")) {
+ gint element=0, channel=0;
+ gchar *name;
+ if((argc < 4)||(sscanf(argv[2], "%d", &element) != 1)||
+ (sscanf(argv[3], "%d", &channel) != 1))
+ {
+ fprintf(stderr,
+ "Usage: %s sound_channel_name <elementid>
<channelid>\n",
+ argv[0]);
+ return -1;
+ }
+ if(!org_moblin_SystemDaemon_sound_channel_name(proxy,
+ element, channel, &name, &gerror))
+ {
+ g_warning ("error: %s", gerror->message);
+ g_error_free (gerror);
+ return -1;
+ }
+ printf("element %d, channel %d is named %s\n",
+ element, channel, name);
+ } else if(!strcmp(argv[1], "sound_volume_range")) {
+ gint element=0, min, max;
+ if((argc < 3)||(sscanf(argv[2], "%d", &element) != 1))
+ {
+ fprintf(stderr,
+ "Usage: %s sound_volume_range <elementid>\n",
+ argv[0]);
+ return -1;
+ }
+ if(!org_moblin_SystemDaemon_sound_volume_range(proxy,
+ element, &min, &max, &gerror))
+ {
+ g_warning ("error: %s", gerror->message);
+ g_error_free (gerror);
+ return -1;
+ }
+ printf("element %d has range [%d, %d]\n",
+ element, min, max);
+ } else if(!strcmp(argv[1], "sound_get_volume")) {
+ gint element=0, channel=0, volume=0;
+ if((argc < 4)||(sscanf(argv[2], "%d", &element) != 1)||
+ (sscanf(argv[3], "%d", &channel) != 1))
+ {
+ fprintf(stderr,
+ "Usage: %s sound_get_volume <elementid> <channelid>\n",
+ argv[0]);
+ return -1;
+ }
+ if(!org_moblin_SystemDaemon_sound_get_volume(proxy,
+ element, channel, &volume, &gerror))
+ {
+ g_warning ("error: %s", gerror->message);
+ g_error_free (gerror);
+ return -1;
+ }
+ printf("get element %d, channel %d, volume is %d\n",
+ element, channel, volume);
+ } else if(!strcmp(argv[1], "sound_set_volume")) {
+ gint element=0, channel=0, volume=0;
+ if((argc < 5)||(sscanf(argv[2], "%d", &element) != 1)||
+ (sscanf(argv[3], "%d", &channel) != 1)||
+ (sscanf(argv[4], "%d", &volume) != 1))
+ {
+ fprintf(stderr,
+ "Usage: %s sound_set_volume <elementid> <channelid>
<volume>\n",
+ argv[0]);
+ return -1;
+ }
+ if(!org_moblin_SystemDaemon_sound_set_volume(proxy,
+ element, channel, volume, &gerror))
+ {
+ g_warning ("error: %s", gerror->message);
+ g_error_free (gerror);
+ return -1;
+ }
+ printf("set element %d, channel %d, to volume %d\n",
+ element, channel, volume);
+ } else if(!strcmp(argv[1], "sound_set_element_volume")) {
+ gint element=0, volume=0;
+ if((argc < 4)||(sscanf(argv[2], "%d", &element) != 1)||
+ (sscanf(argv[3], "%d", &volume) != 1))
+ {
+ fprintf(stderr,
+ "Usage: %s sound_set_element_volume <elementid>
<volume>\n",
+ argv[0]);
+ return -1;
+ }
+ if(!org_moblin_SystemDaemon_sound_set_element_volume(proxy,
+ element, volume, &gerror))
+ {
+ g_warning ("error: %s", gerror->message);
+ g_error_free (gerror);
+ return -1;
+ }
+ printf("set element %d, all channels, to volume %d\n",
+ element, volume);
+ } else if(!strcmp(argv[1], "sound_get_mute")) {
+ gint element=0, channel=0;
+ gboolean mute=FALSE;
+ if((argc < 4)||(sscanf(argv[2], "%d", &element) != 1)||
+ (sscanf(argv[3], "%d", &channel) != 1))
+ {
+ fprintf(stderr,
+ "Usage: %s sound_get_mute <elementid> <channelid>\n",
+ argv[0]);
+ return -1;
+ }
+ if(!org_moblin_SystemDaemon_sound_get_mute(proxy,
+ element, channel, &mute, &gerror))
+ {
+ g_warning ("error: %s", gerror->message);
+ g_error_free (gerror);
+ return -1;
+ }
+ printf("get element %d, channel %d, mute is %s\n",
+ element, channel, (mute)?"ON":"OFF");
+ } else if(!strcmp(argv[1], "sound_set_mute")) {
+ gint element=0, channel=0, mute=0;
+ if((argc < 5)||(sscanf(argv[2], "%d", &element) != 1)||
+ (sscanf(argv[3], "%d", &channel) != 1)||
+ (sscanf(argv[4], "%d", &mute) != 1))
+ {
+ fprintf(stderr,
+ "Usage: %s sound_set_volume <elementid> <channelid>
<mute 0=off/1=on>\n",
+ argv[0]);
+ return -1;
+ }
+ if(!org_moblin_SystemDaemon_sound_set_mute(proxy,
+ element, channel, (mute), &gerror))
+ {
+ g_warning ("error: %s", gerror->message);
+ g_error_free (gerror);
+ return -1;
+ }
+ printf("set element %d, channel %d, to mute %s\n",
+ element, channel, (mute)?"ON":"OFF");
+ } else if(!strcmp(argv[1], "sound_set_element_mute")) {
+ gint element=0, mute=0;
+ if((argc < 4)||(sscanf(argv[2], "%d", &element) != 1)||
+ (sscanf(argv[3], "%d", &mute) != 1))
+ {
+ fprintf(stderr,
+ "Usage: %s sound_set_element_mute <elementid> <mute
0=off/1=on>\n",
+ argv[0]);
+ return -1;
+ }
+ if(!org_moblin_SystemDaemon_sound_set_element_mute(proxy,
+ element, (mute), &gerror))
+ {
+ g_warning ("error: %s", gerror->message);
+ g_error_free (gerror);
+ return -1;
+ }
+ printf("set element %d, all channels, to mute %s\n",
+ element, (mute)?"ON":"OFF");
+ } else if(!strcmp(argv[1], "sound_set_all_mute")) {
+ gint mute=0;
+ if((argc < 3)||(sscanf(argv[2], "%d", &mute) != 1))
+ {
+ fprintf(stderr,
+ "Usage: %s sound_set_all_mute <mute 0=off/1=on>\n",
+ argv[0]);
+ return -1;
+ }
+ if(!org_moblin_SystemDaemon_sound_set_all_mute(proxy,
+ (mute), &gerror))
+ {
+ g_warning ("error: %s", gerror->message);
+ g_error_free (gerror);
+ return -1;
+ }
+ printf("set all elements, all channels, to mute %s\n",
+ (mute)?"ON":"OFF");
+ } else if(!strcmp(argv[1], "sound_get_playback_master")) {
+ gint element;
+ if(!org_moblin_SystemDaemon_sound_get_playback_master(proxy,
+ &element, &gerror))
+ {
+ g_warning ("error: %s", gerror->message);
+ g_error_free (gerror);
+ return -1;
+ }
+ printf("playback master is %d\n", element);
+ } else if(!strcmp(argv[1], "sound_set_playback_master")) {
+ gint element;
+ if((argc < 3)||(sscanf(argv[2], "%d", &element) != 1))
+ {
+ fprintf(stderr,
+ "Usage: %s sound_set_playback_master <element>\n",
+ argv[0]);
+ return -1;
+ }
+ if(!org_moblin_SystemDaemon_sound_set_playback_master(proxy,
+ element, &gerror))
+ {
+ g_warning ("error: %s", gerror->message);
+ g_error_free (gerror);
+ return -1;
+ }
+ printf("playback master is %d\n", element);
+ } else if(!strcmp(argv[1], "sound_get_record_master")) {
+ gint element;
+ if(!org_moblin_SystemDaemon_sound_get_record_master(proxy,
+ &element, &gerror))
+ {
+ g_warning ("error: %s", gerror->message);
+ g_error_free (gerror);
+ return -1;
+ }
+ printf("record master is %d\n", element);
+ } else if(!strcmp(argv[1], "sound_set_record_master")) {
+ gint element;
_______________________________________________
Commits mailing list
[email protected]
https://www.moblin.org/mailman/listinfo/commits
