From 762ae0189353c78c636b548616916380bb8b0e16 Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Thu, 6 Dec 2012 06:42:34 +1100 Subject: [PATCH] Covert 2 C source files from dos to unix line endings. --- src/monkeys_audio_utilities/flac_mac/main.c | 416 ++++++++++++++-------------- src/monkeys_audio_utilities/flac_ren/main.c | 78 +++--- 2 files changed, 247 insertions(+), 247 deletions(-) diff --git a/src/monkeys_audio_utilities/flac_mac/main.c b/src/monkeys_audio_utilities/flac_mac/main.c index 4b2c7f6..0f17787 100644 --- a/src/monkeys_audio_utilities/flac_mac/main.c +++ b/src/monkeys_audio_utilities/flac_mac/main.c @@ -1,208 +1,208 @@ -/* flac_mac - wedge utility to add FLAC support to Monkey's Audio - * Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007,2008,2009 Josh Coalson - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -/* - * This program can be used to allow FLAC to masquerade as one of the other - * supported lossless codecs in Monkey's Audio. See the documentation for - * how to do this. - */ - -#if HAVE_CONFIG_H -# include -#endif - -#include -#include -#include -#include -#include -#include - -static int execit(char *prog, char *args); -static int forkit(char *prog, char *args); - -int main(int argc, char *argv[]) -{ - int flac_return_val = 0, opt_arg = 1, from_arg = -1, to_arg = -1, flac_level = 5, i; - char prog[MAX_PATH], cmdline[MAX_PATH*2], from[MAX_PATH], to[MAX_PATH], macdir[MAX_PATH], options[256], *p; - enum { WAVPACK, RKAU, SHORTEN } codec; - - /* get the directory where MAC external codecs reside */ - if(0 != (p = strrchr(argv[0],'\\'))) { - strcpy(macdir, argv[0]); - *(strrchr(macdir,'\\')+1) = '\0'; - } - else { - strcpy(macdir, ""); - } - - /* determine which codec we were called as and parse the options */ - if(p == 0) - p = argv[0]; - else - p++; - if(0 == strnicmp(p, "short", 5)) { - codec = SHORTEN; - } - else if(0 == strnicmp(p, "rkau", 4)) { - codec = RKAU; - if(argv[1][0] == '-' && argv[1][1] == 'l') { - opt_arg = 2; - switch(argv[1][2]) { - case '1': flac_level = 1; break; - case '2': flac_level = 5; break; - case '3': flac_level = 8; break; - } - } - } - else if(0 == strnicmp(p, "wavpack", 7)) { - codec = WAVPACK; - if(argv[1][0] == '-') { - opt_arg = 2; - switch(argv[1][1]) { - case 'f': flac_level = 1; break; - case 'h': flac_level = 8; break; - default: opt_arg = 1; - } - } - } - else { - return -5; - } - - /* figure out which arguments are the source and destination files */ - for(i = 1; i < argc; i++) - if(argv[i][0] != '-') { - from_arg = i++; - break; - } - for( ; i < argc; i++) - if(argv[i][0] != '-') { - to_arg = i++; - break; - } - if(to_arg < 0) - return -4; - - /* build the command to call flac with */ - sprintf(prog, "%sflac.exe", macdir); - sprintf(options, "-%d", flac_level); - for(i = opt_arg; i < argc; i++) - if(argv[i][0] == '-') { - strcat(options, " "); - strcat(options, argv[i]); - } - sprintf(cmdline, "\"%s\" %s -o \"%s\" \"%s\"", prog, options, argv[to_arg], argv[from_arg]); - - flac_return_val = execit(prog, cmdline); - - /* - * Now that flac has finished, we need to fork a process that will rename - * the resulting file with the correct extension once MAC has moved it to - * it's final resting place. - */ - if(0 == flac_return_val) { - /* get the destination directory, if any */ - if(0 != (p = strchr(argv[to_arg],'\\'))) { - strcpy(from, argv[to_arg]); - *(strrchr(from,'\\')+1) = '\0'; - } - else { - strcpy(from, ""); - } - - /* for the full 'from' and 'to' paths for the renamer process */ - p = strrchr(argv[from_arg],'\\'); - strcat(from, p? p+1 : argv[from_arg]); - strcpy(to, from); - if(0 == strchr(from,'.')) - return -3; - switch(codec) { - case SHORTEN: strcpy(strrchr(from,'.'), ".shn"); break; - case WAVPACK: strcpy(strrchr(from,'.'), ".wv"); break; - case RKAU: strcpy(strrchr(from,'.'), ".rka"); break; - } - strcpy(strrchr(to,'.'), ".flac"); - - sprintf(prog, "%sflac_ren.exe", macdir); - sprintf(cmdline, "\"%s\" \"%s\" \"%s\"", prog, from, to); - - flac_return_val = forkit(prog, cmdline); - } - - return flac_return_val; -} - -int execit(char *prog, char *args) -{ - BOOL ok; - STARTUPINFO startup_info; - PROCESS_INFORMATION proc_info; - - GetStartupInfo(&startup_info); - - ok = CreateProcess( - prog, - args, - 0, /*process security attributes*/ - 0, /*thread security attributes*/ - FALSE, - 0, /*dwCreationFlags*/ - 0, /*environment*/ - 0, /*lpCurrentDirectory*/ - &startup_info, - &proc_info - ); - if(ok) { - DWORD dw; - dw = WaitForSingleObject(proc_info.hProcess, INFINITE); - ok = (dw != 0xFFFFFFFF); - CloseHandle(proc_info.hThread); - CloseHandle(proc_info.hProcess); - } - - return ok? 0 : -1; -} - -int forkit(char *prog, char *args) -{ - BOOL ok; - STARTUPINFO startup_info; - PROCESS_INFORMATION proc_info; - - GetStartupInfo(&startup_info); - - ok = CreateProcess( - prog, - args, - 0, /*process security attributes*/ - 0, /*thread security attributes*/ - FALSE, - DETACHED_PROCESS, /*dwCreationFlags*/ - 0, /*environment*/ - 0, /*lpCurrentDirectory*/ - &startup_info, - &proc_info - ); - if(ok) { - CloseHandle(proc_info.hThread); - CloseHandle(proc_info.hProcess); - } - - return ok? 0 : -2; -} +/* flac_mac - wedge utility to add FLAC support to Monkey's Audio + * Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007,2008,2009 Josh Coalson + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +/* + * This program can be used to allow FLAC to masquerade as one of the other + * supported lossless codecs in Monkey's Audio. See the documentation for + * how to do this. + */ + +#if HAVE_CONFIG_H +# include +#endif + +#include +#include +#include +#include +#include +#include + +static int execit(char *prog, char *args); +static int forkit(char *prog, char *args); + +int main(int argc, char *argv[]) +{ + int flac_return_val = 0, opt_arg = 1, from_arg = -1, to_arg = -1, flac_level = 5, i; + char prog[MAX_PATH], cmdline[MAX_PATH*2], from[MAX_PATH], to[MAX_PATH], macdir[MAX_PATH], options[256], *p; + enum { WAVPACK, RKAU, SHORTEN } codec; + + /* get the directory where MAC external codecs reside */ + if(0 != (p = strrchr(argv[0],'\\'))) { + strcpy(macdir, argv[0]); + *(strrchr(macdir,'\\')+1) = '\0'; + } + else { + strcpy(macdir, ""); + } + + /* determine which codec we were called as and parse the options */ + if(p == 0) + p = argv[0]; + else + p++; + if(0 == strnicmp(p, "short", 5)) { + codec = SHORTEN; + } + else if(0 == strnicmp(p, "rkau", 4)) { + codec = RKAU; + if(argv[1][0] == '-' && argv[1][1] == 'l') { + opt_arg = 2; + switch(argv[1][2]) { + case '1': flac_level = 1; break; + case '2': flac_level = 5; break; + case '3': flac_level = 8; break; + } + } + } + else if(0 == strnicmp(p, "wavpack", 7)) { + codec = WAVPACK; + if(argv[1][0] == '-') { + opt_arg = 2; + switch(argv[1][1]) { + case 'f': flac_level = 1; break; + case 'h': flac_level = 8; break; + default: opt_arg = 1; + } + } + } + else { + return -5; + } + + /* figure out which arguments are the source and destination files */ + for(i = 1; i < argc; i++) + if(argv[i][0] != '-') { + from_arg = i++; + break; + } + for( ; i < argc; i++) + if(argv[i][0] != '-') { + to_arg = i++; + break; + } + if(to_arg < 0) + return -4; + + /* build the command to call flac with */ + sprintf(prog, "%sflac.exe", macdir); + sprintf(options, "-%d", flac_level); + for(i = opt_arg; i < argc; i++) + if(argv[i][0] == '-') { + strcat(options, " "); + strcat(options, argv[i]); + } + sprintf(cmdline, "\"%s\" %s -o \"%s\" \"%s\"", prog, options, argv[to_arg], argv[from_arg]); + + flac_return_val = execit(prog, cmdline); + + /* + * Now that flac has finished, we need to fork a process that will rename + * the resulting file with the correct extension once MAC has moved it to + * it's final resting place. + */ + if(0 == flac_return_val) { + /* get the destination directory, if any */ + if(0 != (p = strchr(argv[to_arg],'\\'))) { + strcpy(from, argv[to_arg]); + *(strrchr(from,'\\')+1) = '\0'; + } + else { + strcpy(from, ""); + } + + /* for the full 'from' and 'to' paths for the renamer process */ + p = strrchr(argv[from_arg],'\\'); + strcat(from, p? p+1 : argv[from_arg]); + strcpy(to, from); + if(0 == strchr(from,'.')) + return -3; + switch(codec) { + case SHORTEN: strcpy(strrchr(from,'.'), ".shn"); break; + case WAVPACK: strcpy(strrchr(from,'.'), ".wv"); break; + case RKAU: strcpy(strrchr(from,'.'), ".rka"); break; + } + strcpy(strrchr(to,'.'), ".flac"); + + sprintf(prog, "%sflac_ren.exe", macdir); + sprintf(cmdline, "\"%s\" \"%s\" \"%s\"", prog, from, to); + + flac_return_val = forkit(prog, cmdline); + } + + return flac_return_val; +} + +int execit(char *prog, char *args) +{ + BOOL ok; + STARTUPINFO startup_info; + PROCESS_INFORMATION proc_info; + + GetStartupInfo(&startup_info); + + ok = CreateProcess( + prog, + args, + 0, /*process security attributes*/ + 0, /*thread security attributes*/ + FALSE, + 0, /*dwCreationFlags*/ + 0, /*environment*/ + 0, /*lpCurrentDirectory*/ + &startup_info, + &proc_info + ); + if(ok) { + DWORD dw; + dw = WaitForSingleObject(proc_info.hProcess, INFINITE); + ok = (dw != 0xFFFFFFFF); + CloseHandle(proc_info.hThread); + CloseHandle(proc_info.hProcess); + } + + return ok? 0 : -1; +} + +int forkit(char *prog, char *args) +{ + BOOL ok; + STARTUPINFO startup_info; + PROCESS_INFORMATION proc_info; + + GetStartupInfo(&startup_info); + + ok = CreateProcess( + prog, + args, + 0, /*process security attributes*/ + 0, /*thread security attributes*/ + FALSE, + DETACHED_PROCESS, /*dwCreationFlags*/ + 0, /*environment*/ + 0, /*lpCurrentDirectory*/ + &startup_info, + &proc_info + ); + if(ok) { + CloseHandle(proc_info.hThread); + CloseHandle(proc_info.hProcess); + } + + return ok? 0 : -2; +} diff --git a/src/monkeys_audio_utilities/flac_ren/main.c b/src/monkeys_audio_utilities/flac_ren/main.c index fb574f3..4dc3b06 100644 --- a/src/monkeys_audio_utilities/flac_ren/main.c +++ b/src/monkeys_audio_utilities/flac_ren/main.c @@ -1,39 +1,39 @@ -/* flac_ren - renamer part of utility to add FLAC support to Monkey's Audio - * Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007,2008,2009 Josh Coalson - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#if HAVE_CONFIG_H -# include -#endif - -#include -#include -#include -#include - -int main(int argc, char *argv[]) -{ - struct stat s; - - /* wait till the 'from' file has reached its final destination */ - do { - Sleep(2000); - } while(stat(argv[1], &s) < 0); - - /* now rename it */ - return rename(argv[1], argv[2]); -} +/* flac_ren - renamer part of utility to add FLAC support to Monkey's Audio + * Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007,2008,2009 Josh Coalson + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#if HAVE_CONFIG_H +# include +#endif + +#include +#include +#include +#include + +int main(int argc, char *argv[]) +{ + struct stat s; + + /* wait till the 'from' file has reached its final destination */ + do { + Sleep(2000); + } while(stat(argv[1], &s) < 0); + + /* now rename it */ + return rename(argv[1], argv[2]); +} -- 2.7.4