[Hotkeys-commits] r252 - trunk/src

[Alexander Wirt]

Author: formorer
Date: 2005-10-01 20:54:44 +0000 (Sat, 01 Oct 2005)
New Revision: 252

Modified:
   trunk/src/conf.c
   trunk/src/hotkeys.c
Log:
Added "nosplash", "background" and "osd" to configoptions (#150705)

Modified: trunk/src/conf.c
===================================================================
--- trunk/src/conf.c	2005-10-01 20:44:40 UTC (rev 251)
+++ trunk/src/conf.c	2005-10-01 20:54:44 UTC (rev 252)
@@ -41,6 +41,10 @@
     /* CDROM device */
     "CDROM",           "/dev/cdrom",
 
+	/* general options */
+	"daemon",          "False",
+	"no_splash",       "False",
+	
     /* general actions */
     "PrevTrack",       "xmms --rew",
     "Play",            "xmms --play-pause",
@@ -78,6 +82,7 @@
     "osd_timeout",     "3",
     "osd_position",    "bottom",
     "osd_offset",      "25",
+	"osd_enabled",     "False",
     NULL,              NULL
 };
 
@@ -117,6 +122,20 @@
     memset( &k, 0, sizeof(k) );
     memset( &data, 0, sizeof(data) );
 
+	if (strncasecmp(value, "false", 5) == 0 ||
+		strncasecmp(value, "off", 3) == 0 ||
+		strncasecmp(value, "no", 2) == 0 ||
+		strncasecmp(value, "0", 1) == 0)
+	value = xstrdup("0");
+
+	if (strncasecmp(value, "true", 4) == 0 ||
+		strncasecmp(value, "no", 2) == 0 ||
+		strncasecmp(value, "yes", 3) == 0 ||
+		strncasecmp(value, "1", 1) == 0)
+	value = xstrdup("1");
+	
+		
+
     k.data = xstrdup(key);
     k.size = strlen(key) + 1;
     data.data = xstrdup(value);

Modified: trunk/src/hotkeys.c
===================================================================
--- trunk/src/hotkeys.c	2005-10-01 20:44:40 UTC (rev 251)
+++ trunk/src/hotkeys.c	2005-10-01 20:54:44 UTC (rev 252)
@@ -1503,6 +1503,13 @@
     kbd.noOfCustomCmds = 0;
     kbd.defCmds = XCALLOC( defEntry, NUM_PREDEF_HOTKEYS );
 
+	#ifdef HAVE_LIBXOSD
+		if ( getConfig("osd_enabled")[0] == '0' ) { toggleOSD("off"); }
+	#endif
+
+	if ( getConfig("daemon")[0] == '1' ) { background = True; }
+	if ( getConfig("no_splash")[0] == '1' ) { noSplash = True; }
+
     if ( !parseArgs(argc,argv) )
         bailout();
 
@@ -1544,7 +1551,7 @@
 #endif
 
 #if HAVE_GTK
-    if ( noSplash )
+    if ( noSplash && !background)
 #endif
         printf( "%s started successfully.\n", progname );