Skip to content

Commit

Permalink
Merge pull request #61 from argilo/clean-formatting
Browse files Browse the repository at this point in the history
Remove non-ASCII characters and trailing whitespace from source files
  • Loading branch information
fabiangreffrath committed Sep 4, 2020
2 parents 1b71a6b + 0a84fa3 commit f71b5e8
Show file tree
Hide file tree
Showing 131 changed files with 854 additions and 854 deletions.
8 changes: 4 additions & 4 deletions aacDECdrop/audio.h
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
/*
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
** Copyright (C) 2003-2004 M. Bakker, Ahead Software AG, http://www.nero.com
**
**
** 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
** along with this program; if not, write to the Free Software
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
**
** Any non-GPL usage of this software or parts of this software is strictly
Expand Down
2 changes: 1 addition & 1 deletion aacDECdrop/decthread.c
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ DWORD WINAPI decode_thread(LPVOID arg)
numfiles = 0;

Sleep(500);
}
}

DeleteCriticalSection(&mutex);

Expand Down
38 changes: 19 additions & 19 deletions aacDECdrop/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#define CREATEFONT(sz) \
CreateFont((sz), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
VARIABLE_PITCH | FF_SWISS, "")

HANDLE event = NULL;
int width = 130, height = 130;
RECT bar1, bar2, vbrBR;
Expand Down Expand Up @@ -232,7 +232,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PSTR szCmdLine,
set_outputFormat(iniSettings.outputFormat);
set_fileType(iniSettings.fileType);
set_object_type(iniSettings.object_type);

for (frame = 0; frame < 8; frame++)
hbm[frame] = LoadImage(hinst, MAKEINTRESOURCE(IDB_TF01 + frame), IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION);
frame = 0;
Expand All @@ -243,7 +243,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PSTR szCmdLine,
DispatchMessage(&msg);
}

for (frame = 0; frame < 8; frame++)
for (frame = 0; frame < 8; frame++)
DeleteObject(hbm[frame]);

return msg.wParam;
Expand Down Expand Up @@ -373,7 +373,7 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
if (animate || frame)
{
frame++;
if (frame > 7)
if (frame > 7)
frame -= 8;
}
else
Expand Down Expand Up @@ -437,7 +437,7 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
return 0;

case WM_COMMAND:
switch (LOWORD(wParam))
switch (LOWORD(wParam))
{
case IDM_QUIT:
WriteIniFile(INI_FILE);
Expand All @@ -446,7 +446,7 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
break;
case IDM_ONTOP:
set_always_on_top(hwnd, ~GetMenuState(menu, LOWORD(wParam), MF_BYCOMMAND) & MF_CHECKED);
break;
break;
case IDM_LOGERR:
set_logerr(hwnd, ~GetMenuState(menu, LOWORD(wParam), MF_BYCOMMAND) & MF_CHECKED);
break;
Expand All @@ -459,10 +459,10 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
}
case IDM_VOLUME:
{
int value =
int value =
DialogBox(
hinst,
MAKEINTRESOURCE(IDD_VOLUME),
hinst,
MAKEINTRESOURCE(IDD_VOLUME),
hwnd, QCProc);

if (value == -2)
Expand All @@ -484,7 +484,7 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
hdrop = (HANDLE)wParam;
HandleDrag(hwnd, hdrop);
return 0;

case WM_DESTROY:
decoding_done = 1;
PostQuitMessage(0);
Expand All @@ -498,13 +498,13 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
* Encode parameters dialog procedures.
*/

BOOL CALLBACK QCProc(HWND hwndDlg, UINT message,
WPARAM wParam, LPARAM lParam)
BOOL CALLBACK QCProc(HWND hwndDlg, UINT message,
WPARAM wParam, LPARAM lParam)
{
switch (message)
{
case WM_INITDIALOG:
switch (message)
{
case WM_INITDIALOG:

if(iniSettings.decode_mode == 0)
{
CheckDlgButton(hwndDlg,IDC_PLAYBACK,TRUE);
Expand Down Expand Up @@ -579,8 +579,8 @@ BOOL CALLBACK QCProc(HWND hwndDlg, UINT message,
EndDialog(hwndDlg, -1);
break;

case WM_COMMAND:
switch (LOWORD(wParam))
case WM_COMMAND:
switch (LOWORD(wParam))
{
case IDC_BUTTON1:
{
Expand Down Expand Up @@ -670,7 +670,7 @@ BOOL CALLBACK QCProc(HWND hwndDlg, UINT message,
break;
}
}
return FALSE;
return FALSE;
}


Expand Down
6 changes: 3 additions & 3 deletions aacDECdrop/misc.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ void error_dialog(const char *fmt, ...)
if (strlen(fmt) > 750)
{
sprintf(msgbuf, "%s %s", "<buffer overflow> ", fmt);
}
else
}
else
{
if (_filename != NULL && strlen(_filename) < 255)
{
Expand All @@ -49,7 +49,7 @@ void error_dialog(const char *fmt, ...)
}

va_start(ap, fmt);

vsprintf(bufp, fmt, ap);

va_end(ap);
Expand Down
2 changes: 1 addition & 1 deletion aacDECdrop/resource.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
#define IDM_QUIT 40019

// Next default values for new objects
//
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NO_MFC 1
Expand Down
8 changes: 4 additions & 4 deletions frontend/audio.c
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
/*
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com
**
**
** 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
** along with this program; if not, write to the Free Software
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
**
** Any non-GPL usage of this software or parts of this software is strictly
Expand Down
8 changes: 4 additions & 4 deletions frontend/audio.h
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
/*
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com
**
**
** 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
** along with this program; if not, write to the Free Software
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
**
** Any non-GPL usage of this software or parts of this software is strictly
Expand Down
6 changes: 3 additions & 3 deletions frontend/getopt.c
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ my_index (str, chr)
}

#endif /* GNU C library. */


/* Handle permutation of arguments. */

/* Describe the part of ARGV that contains non-options that have
Expand Down Expand Up @@ -265,7 +265,7 @@ exchange (argv)
temp = *first; *first = *last; *last = temp; first++; last--;
}
}


/* Scan elements of ARGV (whose length is ARGC) for option characters
given in OPTSTRING.
Expand Down Expand Up @@ -680,7 +680,7 @@ getopt_long (argc, argv, options, long_options, opt_index)
}

#endif /* _LIBC or not __GNU_LIBRARY__. */


#ifdef TEST

/* Compile with -DTEST to make an executable for use in testing
Expand Down
2 changes: 1 addition & 1 deletion frontend/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ static void advance_buffer(aac_buffer *b, int bytes)
while ((b->bytes_into_buffer > 0) && (bytes > 0))
{
int chunk = min(bytes, b->bytes_into_buffer);

bytes -= chunk;
b->file_offset += chunk;
b->bytes_consumed = chunk;
Expand Down
6 changes: 3 additions & 3 deletions frontend/unicode_support.c
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ void init_commandline_arguments_utf8(int *argc, char ***argv)
fprintf(stderr, "\nFATAL: Malloc failed\n\n");
exit(-1);
}

for(i = 0; i < nArgs; i++)
{
(*argv)[i] = utf16_to_utf8(szArglist[i]);
Expand All @@ -119,7 +119,7 @@ void init_commandline_arguments_utf8(int *argc, char ***argv)
void free_commandline_arguments_utf8(int *argc, char ***argv)
{
int i = 0;

if(*argv != NULL)
{
for(i = 0; i < *argc; i++)
Expand All @@ -140,7 +140,7 @@ FILE *fopen_utf8(const char *filename_utf8, const char *mode_utf8)
FILE *ret = NULL;
wchar_t *filename_utf16 = utf8_to_utf16(filename_utf8);
wchar_t *mode_utf16 = utf8_to_utf16(mode_utf8);

if(filename_utf16 && mode_utf16)
{
ret = _wfopen(filename_utf16, mode_utf16);
Expand Down
8 changes: 4 additions & 4 deletions include/faad.h
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
/*
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com
**
**
** 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
** along with this program; if not, write to the Free Software
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
**
** Any non-GPL usage of this software or parts of this software is strictly
Expand Down
8 changes: 4 additions & 4 deletions include/neaacdec.h
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
/*
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com
**
**
** 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
** along with this program; if not, write to the Free Software
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
**
** Any non-GPL usage of this software or parts of this software is strictly
Expand Down
8 changes: 4 additions & 4 deletions libfaad/analysis.h
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
/*
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com
**
**
** 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
** along with this program; if not, write to the Free Software
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
**
** Any non-GPL usage of this software or parts of this software is strictly
Expand Down
8 changes: 4 additions & 4 deletions libfaad/bits.c
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
/*
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com
**
**
** 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
** along with this program; if not, write to the Free Software
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
**
** Any non-GPL usage of this software or parts of this software is strictly
Expand Down
Loading

0 comments on commit f71b5e8

Please sign in to comment.