diff --git a/wmix/NEWS b/wmix/NEWS index ddc0d90..f27b496 100644 --- a/wmix/NEWS +++ b/wmix/NEWS @@ -83,7 +83,7 @@ patch from Gilles QUERRET . Now instead of dragging the knob, you can use your mouse wheel to adjust the current channel volume. Position the cursor anywhere on the dockapp, and move the wheel. This behaviour is off by default, but you can compile wmix with -DMOUSEWHEEL -in the Makefile to enable this feature. Incase your mouse has more than 2 +in the Makefile to enable this feature. In case your mouse has more than 2 buttons and a wheel, you can set which button signals the wheel generates as "up" and "down" in mix.c, lines 45 and 46. The default is for a standard mouse with 2 buttons and a wheel. WHEEL_STEP is the amount to adjust the knob. diff --git a/wmix/config.c b/wmix/config.c index 0b80013..0238ffb 100644 --- a/wmix/config.c +++ b/wmix/config.c @@ -43,7 +43,7 @@ " -e exclude channel, can be used many times\n" \ " -f parse this config [~/.wmixrc]\n" \ " -h print this help\n" \ - " -k disable grabing volume control keys\n" \ + " -k disable grabbing volume control keys\n" \ " -m oss mixer device [/dev/mixer]\n" \ " or alsa card name [default]\n" \ " -o display osd on this monitor number or name [0]\n" \ @@ -152,7 +152,7 @@ void parse_cli_options(int argc, char **argv) switch (opt) { case '?': - fprintf(stderr, "wmix:error: unknow option '-%c'\n", optopt); + fprintf(stderr, "wmix:error: unknown option '-%c'\n", optopt); error_found = true; break; @@ -262,7 +262,7 @@ void config_read(void) fp = fopen(filename, "r"); if (fp == NULL) { if (config.file != NULL) { - /* The config file was explicitely specified by user, tell him there's a problem */ + /* The config file was explicitly specified by user, tell him there's a problem */ fprintf(stderr, "wmix: error, could not load configuration file \"%s\"\n", filename); exit(EXIT_FAILURE); } @@ -395,7 +395,7 @@ void config_read(void) fprintf(stderr, "wmix:error: value '%s' not understood for wheelstep in %s at line %d\n", value, filename, line); } else { - fprintf(stderr, "wmix:warning: unknow keyword '%s' at line %d of \"%s\", ignored\n", + fprintf(stderr, "wmix:warning: unknown keyword '%s' at line %d of \"%s\", ignored\n", keyword, line, filename); } } diff --git a/wmix/mmkeys.c b/wmix/mmkeys.c index 2dae788..d4f63f6 100644 --- a/wmix/mmkeys.c +++ b/wmix/mmkeys.c @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ /* - * mmkeys.c: functions related to grabing the Multimedia Keys on keyboard + * mmkeys.c: functions related to grabbing the Multimedia Keys on keyboard */ #include