[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[98] mplayerxp

[<nic...@us...>]

Revision: 98
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=98&view=rev
Author:   nickols_k
Date:     2010-01-12 17:58:30 +0000 (Tue, 12 Jan 2010)

Log Message:
-----------
cleanups

Modified Paths:
--------------
    mplayerxp/cfgparser.c
    mplayerxp/input/input.c

Modified: mplayerxp/cfgparser.c
===================================================================
--- mplayerxp/cfgparser.c	2010-01-11 18:28:46 UTC (rev 97)
+++ mplayerxp/cfgparser.c	2010-01-12 17:58:30 UTC (rev 98)
@@ -1327,8 +1327,8 @@
 		}
 		break;
 		case CONF_TYPE_STRING: {
-		    const char *defv = (char*)(opts[i].p);
-		    MSG_INFO("'%s'",defv);
+		    const char **defv = (char**)(opts[i].p);
+		    if(defv) MSG_INFO("'%s'",*defv);
 		}
 		break;
 		case CONF_TYPE_INT: {

Modified: mplayerxp/input/input.c
===================================================================
--- mplayerxp/input/input.c	2010-01-11 18:28:46 UTC (rev 97)
+++ mplayerxp/input/input.c	2010-01-12 17:58:30 UTC (rev 98)
@@ -1560,29 +1560,14 @@
   exit(0);
 }
 
-static char defkname[2];
-static const char * mp_find_keyname(int keyval) {
-  unsigned i;
-  defkname[1]='\0';
-  if( keyval>' ' && keyval<='z' ) {
-    defkname[0]=keyval;
-    return defkname;
-  }
-  for(i= 0; key_names[i].name != NULL ; i++) {
-    if(keyval==key_names[i].key) return key_names[i].name;
-  }
-  return "unknown";
-}
-
 void mp_input_print_binds(void) {
   unsigned i,j;
   MSG_INFO("List of available key bindings:\n");
   for(i=0; def_cmd_binds[i].cmd != NULL ; i++) {
-    MSG_INFO("  %-15s",def_cmd_binds[i].cmd);
     for(j=0;def_cmd_binds[i].input[j] != 0;j++) {
-	MSG_INFO(" %s",mp_find_keyname(def_cmd_binds[i].input[j]));
+	MSG_INFO("  %-20s",mp_input_get_key_name(def_cmd_binds[i].input[j]));
     }
-    MSG_INFO("\n");
+    MSG_INFO(" %s\n",def_cmd_binds[i].cmd);
   }
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.