[patch] proposed moc-1.1.0-gcc3.3 patch

moc-1.1.0-gcc3.3.patch (text/plain), 4.10 KB, created by Brandy Westcott (RETIRED) on 2003-10-18 03:45:16 UTC

diff -ur moc-1.1.0/interface.c moc-1.1.0-gentoo/interface.c
--- moc-1.1.0/interface.c	2002-12-01 10:33:23.000000000 +1300
+++ moc-1.1.0-gentoo/interface.c	2003-10-18 23:25:01.000000000 +1300
@@ -573,36 +573,33 @@
 		wbkgd (main_subwin, COLOR_PAIR(1));
 	werase (main_subwin);
 
-	mvwprintw (main_subwin, 0, 0, "\
-  UP, DOWN	Move up and down in the menu
-  PAGE UP/DOWN	Move one page up/down
-  HOME, END	Move to the first, last item
-  ENTER		Start playing files (from this file) or go to directory
-  s		Stop playing
-  n		Next song
-  p		Pause/unpause
-  LEFT, RIGHT	Seek backward, forward
-  h		Show this help screen
-  f		Switch between short and full names
-  m		Go to the music directory (requires an entry in the config)
-  r		Redraw the screen
-  a/A		Add file to the playlist / Add directory recursively
-  d/C		Delete item from the playlist / Clear the playlist
-  l		Switch between playlist and file list
-  S/R		Switch shuffle / repeat
-");
+	mvwprintw (main_subwin, 0, 0, "\n"
+"  UP, DOWN	Move up and down in the menu\n"
+"  PAGE UP/DOWN	Move one page up/down\n"
+"  HOME, END	Move to the first, last item\n"
+"  ENTER		Start playing files (from this file) or go to directory\n"
+"  s		Stop playing\n"
+"  n		Next song\n"
+"  p		Pause/unpause\n"
+"  LEFT, RIGHT	Seek backward, forward\n"
+"  h		Show this help screen\n"
+"  f		Switch between short and full names\n"
+"  m		Go to the music directory (requires an entry in the config)\n"
+"  r		Redraw the screen\n"
+"  a/A		Add file to the playlist / Add directory recursively\n"
+"  d/C		Delete item from the playlist / Clear the playlist\n"
+"  l		Switch between playlist and file list\n"
+"  S/R		Switch shuffle / repeat\n");
 
 #ifdef VERSION_CHECKER
-	wprintw (main_subwin, "\
-  v		Check if a newer version of the MOC is available
-");
+	wprintw (main_subwin, "\n"
+"  v		Check if a newer version of the MOC is available\n");
 #endif
-	
+
 #ifdef HAVE_OSS
-	wprintw (main_subwin, "\
-  '.' , ','	Increase, decrease volume by 5%
-  '>' , '<'	Increase, decrease volume by 1%
-");
+	wprintw (main_subwin, "\n"
+"  '.' , ','	Increase, decrease volume by 5%\n"
+"  '>' , '<'	Increase, decrease volume by 1%\n");
 #endif
 
 	wrefresh (main_subwin);
diff -ur moc-1.1.0/main.c moc-1.1.0-gentoo/main.c
--- moc-1.1.0/main.c	2002-12-01 22:39:18.000000000 +1300
+++ moc-1.1.0-gentoo/main.c	2003-10-18 23:21:15.000000000 +1300
@@ -77,27 +77,27 @@
 
 /* Show program usage and exit */
 static void usage (const char *prg_name) {
-	printf ("\
-"PACKAGE_STRING"
-Usage:
-%s [OPTIONS]... [FILE]...
--V --version		Show program version and exit.
--h --help		Show usage and exit.
--r --recursively	Add files in direstories given as an argument
-			recursively.
--f --fullinfo		Show titles (eg from id3tags) instead of names in the
-			menu (default).
--s --shortinfo		Show file names in the menu (opposite to -f).
--m --musicdir		Go to your music directory after start (requires such
-			entry in the config file).
--e --errors		Show errors in streams.
--n --no-errors		Do not show errors in streams (opposite to -e).
--p --priority N		Set the priority to a given value.
--l --dont-play		Don't start playing files added as command line
-			arguments.
--R --repeat		Turn on repeat.
--E --no-repeat		Turn off repeat.
-", prg_name);
+	printf ("\n"
+PACKAGE_STRING"\n"
+"Usage:\n"
+"%s [OPTIONS]... [FILE]...\n"
+"-V --version		Show program version and exit.\n"
+"-h --help		Show usage and exit.\n"
+"-r --recursively	Add files in direstories given as an argument\n"
+"			recursively.\n"
+"-f --fullinfo		Show titles (eg from id3tags) instead of names in the\n"
+"			menu (default).\n"
+"-s --shortinfo		Show file names in the menu (opposite to -f).\n"
+"-m --musicdir		Go to your music directory after start (requires such\n"
+"			entry in the config file).\n"
+"-e --errors		Show errors in streams.\n"
+"-n --no-errors		Do not show errors in streams (opposite to -e).\n"
+"-p --priority N		Set the priority to a given value.\n"
+"-l --dont-play		Don't start playing files added as command line\n"
+"			arguments.\n"
+"-R --repeat		Turn on repeat.\n"
+"-E --no-repeat		Turn off repeat.\n"
+, prg_name);
 }
 
 /* Return the current directory name */