mirror of
https://github.com/lwvmobile/dsd-fme.git
synced 2026-11-17 03:07:24 -05:00
Merge pull request #25 from lwvmobile/lwvmobile-patch-1
Fix Naughty Merge
This commit is contained in:
@@ -64,7 +64,7 @@ char * FM_banner[9] = {
|
|||||||
" ██║ ██║ ╚═══██╗██║ ██║ ██╔══╝ ██║╚██╔╝██║██╔══╝ ",
|
" ██║ ██║ ╚═══██╗██║ ██║ ██╔══╝ ██║╚██╔╝██║██╔══╝ ",
|
||||||
" ██████╔╝██████╔╝██████╔╝ ██║ ██║ ╚═╝ ██║███████╗",
|
" ██████╔╝██████╔╝██████╔╝ ██║ ██║ ╚═╝ ██║███████╗",
|
||||||
" ╚═════╝ ╚═════╝ ╚═════╝ ╚═╝ ╚═╝ ╚═╝╚══════╝",
|
" ╚═════╝ ╚═════╝ ╚═════╝ ╚═╝ ╚═╝ ╚═╝╚══════╝",
|
||||||
"https://github.com/lwvmobile/dsd-fme"
|
"https://github.com/lwvmobile/dsd-fme/tree/pulseaudio "
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
@@ -381,7 +381,6 @@ usage ()
|
|||||||
fprintf (stderr," (default=15)\n");
|
fprintf (stderr," (default=15)\n");
|
||||||
fprintf (stderr,"\n");
|
fprintf (stderr,"\n");
|
||||||
fprintf (stderr,"Report bugs to: https://github.com/lwvmobile/dsd-fme/issues \n");
|
fprintf (stderr,"Report bugs to: https://github.com/lwvmobile/dsd-fme/issues \n");
|
||||||
|
|
||||||
exit (0);
|
exit (0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -596,10 +595,10 @@ main (int argc, char **argv)
|
|||||||
fprintf (stderr,"%s", KNRM); //change back to normal
|
fprintf (stderr,"%s", KNRM); //change back to normal
|
||||||
fprintf (stderr, "%s \n", FM_banner[7]);
|
fprintf (stderr, "%s \n", FM_banner[7]);
|
||||||
//pretty_colors();
|
//pretty_colors();
|
||||||
//printf ("Digital Speech Decoder 1.7.0-dev (build:%s)\n", GIT_TAG);
|
//fprintf (stderr,"Digital Speech Decoder 1.7.0-dev (build:%s)\n", GIT_TAG);
|
||||||
printf ("Digital Speech Decoder: Florida Man Edition\n");
|
fprintf (stderr,"Digital Speech Decoder: Florida Man Edition\n");
|
||||||
printf ("Github Build Version: %s \n", GIT_TAG);
|
fprintf (stderr, "Github Build Version: %s \n", GIT_TAG);
|
||||||
printf ("mbelib version %s\n", versionstr);
|
fprintf (stderr,"mbelib version %s\n", versionstr);
|
||||||
|
|
||||||
initOpts (&opts);
|
initOpts (&opts);
|
||||||
initState (&state);
|
initState (&state);
|
||||||
|
|||||||
Reference in New Issue
Block a user