1.3.2: fix #1

Sound-Linux-More · Jul 4, 2022 · 0233391 · 0233391
1 parent fa4adcc
commit 0233391
Show file tree

Hide file tree

Showing 24 changed files with 50 additions and 40 deletions.
diff --git a/COPYING → LICENSE b/COPYING → LICENSE
diff --git a/Makefile b/Makefile
@@ -2,11 +2,11 @@ SHELL    = /bin/sh
 CC       = gcc
 
 TARGET   = wavegain
-CFLAGS  += -m32
+CFLAGS  += -Wall
 DEFS     = -DHAVE_CONFIG_H
 LIBS     = -lm
-SOURCES := $(wildcard *.c)
-HEADERS := $(wildcard *.h)
+SOURCES := $(wildcard src/*.c)
+HEADERS := $(wildcard src/*.h)
 
 prefix   = /usr/local
 bindir   = $(prefix)/bin

diff --git a/README → README.md b/README → README.md
@@ -1,4 +1,11 @@
-ReplayGain for wave files, v1.3.2
+![GitHub release (latest by date)](https://img.shields.io/github/v/release/Sound-Linux-More/wavegain)
+![GitHub Release Date](https://img.shields.io/github/release-date/Sound-Linux-More/wavegain)
+![GitHub repo size](https://img.shields.io/github/repo-size/Sound-Linux-More/wavegain)
+![GitHub all releases](https://img.shields.io/github/downloads/Sound-Linux-More/wavegain/total)
+![GitHub](https://img.shields.io/github/license/Sound-Linux-More/wavegain)
+
+# Wavegain
+ReplayGain for wave files
 
 WaveGain is an application of the ReplayGain algorithms to standard PCM wave
 files. Calculated gain adjustments are applied directly to the audio data,
@@ -12,8 +19,7 @@ current players are aware of this "standard", the metadata is used only by
 WaveGain for the "--undo-gain" feature, which is lossy.
 
 
-About replaygain
--------------------------------------------------------------------------------
+## About replaygain
 
 Replaygain is a standard that allows compatible players to play audio files with
 an adjusted volume gain so they have a consistent perceived loudness.
@@ -35,8 +41,7 @@ http://wiki.hydrogenaudio.org/index.php?title=Replaygain
 http://wiki.hydrogenaudio.org/index.php?title=ReplayGain_specification
 
 
-The saga of a Debian package for wavegain:
--------------------------------------------------------------------------------
+## The saga of a Debian package for wavegain:
 
 - Current source code (in .zip format) and windows binaries are published at
 	http://www.rarewares.org/others.php
@@ -53,43 +58,49 @@ packaging improved from the Mint release, and some patches to fix some
 (serious) Linux issues.
 
 
-Install how-to
--------------------------------------------------------------------------------
+## Install how-to
 
 There are 2 approaches: you can build and install a .deb package, or simply
 compile and install from source. For both I assume you are already at the
 source directory (which is not the root directory of the cloned repository)
 
 Debian method:
 This is OUTDATED, UNMAINTANED and NON-WORKING! Use Traditional Method instead!
+```sh
 $ sudo apt-get install devscripts # if you don't already have debuild
 $ debuild -- binary && sudo dpkg --install ../wavegain_*.deb
+```
 
 Traditional method:
+```sh
 $ make && sudo make install # by default installs to /usr/local/bin/wavegain
+```
 or
+```sh
 $ make && sudo make install prefix=/usr # to install to /usr/bin/wavegain
+```
 
 Currently, 64-bit binaries build fine but can generate corrupted audio on output
 files, so to prevent this by default it builts a 32-bit executable instead,
 which runs and works fine on 64-bit architectures. However, multi-arch libraries
 and headers might be needed as a pre-requiste for compiling. On Debian/Ubuntu this
 can be installed by:
 
+```sh
 	sudo apt install gcc-multilib
+```
+
 
+## Pre-compiled binaries and old versions
 
-Pre-compiled binaries and old versions
--------------------------------------------------------------------------------
 You can find pre-compiled .DEB binariy packages for i386 and amd64, as well
 as as some other goodies, like a mega-archive of all previous versions
 and a (lame and outdated) html manual in the Downloads section of GitHub:
 
 https://github.com/MestreLion/wavegain/downloads
 
 
-License and copyright
--------------------------------------------------------------------------------
+## License and copyright
 
 WaveGain is Copyright (c) 2002-2010 John Edwards <john.edwards33@ntlworld.com>,
 a.k.a. John33, and several other co-authors and contributors are mentioned as
@@ -107,13 +118,14 @@ The Debianization and aditional material, like this README and Makefile, is
 Copyright (c) 2012 Rodrigo Silva (MestreLion)
 
 
-Documentation (from wavegain --help)
--------------------------------------------------------------------------------
+## Documentation (from wavegain --help)
 
 Copyright (c) 2002-2010 John Edwards <john.edwards33@ntlworld.com>
 Additional code by Magnus Holmgren, Gian-Carlo Pascutto, and Tycho
 
- Usage: wavegain [options] input.wav [...]
+Usage:
+```sh
+wavegain [options] input.wav [...]
 
  OPTIONS
   -h, --help       Prints this help information.
@@ -183,6 +195,4 @@ Additional code by Magnus Holmgren, Gian-Carlo Pascutto, and Tycho
   11025Hz or 8000Hz.
   16 bit integer 'aiff' files are also supported.
   Wildcards (?, *) can be used in the filename, or '-' for stdin.
-
-
-wavegain-1.3.2
+```
diff --git a/mswindows/WaveGain.icproj b/mswindows/WaveGain.icproj
@@ -30,7 +30,7 @@
 			Name="Source Files"
 			>
 			<File
-				RelativePath="..\audio.c"
+				RelativePath="..\src\audio.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -42,7 +42,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\dither.c"
+				RelativePath="..\src\dither.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -54,7 +54,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\gain_analysis.c"
+				RelativePath="..\src\gain_analysis.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -66,7 +66,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\getopt.c"
+				RelativePath="..\src\getopt.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -78,7 +78,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\getopt1.c"
+				RelativePath="..\src\getopt1.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -90,7 +90,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\main.c"
+				RelativePath="..\src\main.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -102,7 +102,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\misc.c"
+				RelativePath="..\src\misc.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -114,7 +114,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\recurse.c"
+				RelativePath="..\src\recurse.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -126,7 +126,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\wavegain.c"
+				RelativePath="..\src\wavegain.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"

diff --git a/mswindows/WaveGain.vcproj b/mswindows/WaveGain.vcproj
@@ -297,7 +297,7 @@
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
 			<File
-				RelativePath="..\audio.c"
+				RelativePath="..\src\audio.c"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -327,7 +327,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\dither.c"
+				RelativePath="..\src\dither.c"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -357,7 +357,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\gain_analysis.c"
+				RelativePath="..\src\gain_analysis.c"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -387,7 +387,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\getopt.c"
+				RelativePath="..\src\getopt.c"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -417,7 +417,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\getopt1.c"
+				RelativePath="..\src\getopt1.c"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -447,7 +447,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\main.c"
+				RelativePath="..\src\main.c"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -477,7 +477,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\misc.c"
+				RelativePath="..\src\misc.c"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -507,7 +507,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\recurse.c"
+				RelativePath="..\src\recurse.c"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -537,7 +537,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\wavegain.c"
+				RelativePath="..\src\wavegain.c"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -572,11 +572,11 @@
 			Filter="h;hpp;hxx;hm;inl"
 			>
 			<File
-				RelativePath="..\gain_analysis.h"
+				RelativePath="..\src\gain_analysis.h"
 				>
 			</File>
 			<File
-				RelativePath="..\getopt.h"
+				RelativePath="..\src\getopt.h"
 				>
 			</File>
 		</Filter>

diff --git a/audio.c → src/audio.c b/audio.c → src/audio.c
diff --git a/audio.h → src/audio.h b/audio.h → src/audio.h
diff --git a/config.h → src/config.h b/config.h → src/config.h
diff --git a/dither.c → src/dither.c b/dither.c → src/dither.c
diff --git a/dither.h → src/dither.h b/dither.h → src/dither.h
diff --git a/gain_analysis.c → src/gain_analysis.c b/gain_analysis.c → src/gain_analysis.c
diff --git a/gain_analysis.h → src/gain_analysis.h b/gain_analysis.h → src/gain_analysis.h
diff --git a/getopt.c → src/getopt.c b/getopt.c → src/getopt.c
diff --git a/getopt.h → src/getopt.h b/getopt.h → src/getopt.h
diff --git a/getopt1.c → src/getopt1.c b/getopt1.c → src/getopt1.c
diff --git a/i18n.h → src/i18n.h b/i18n.h → src/i18n.h
diff --git a/main.c → src/main.c b/main.c → src/main.c
diff --git a/main.h → src/main.h b/main.h → src/main.h
diff --git a/misc.c → src/misc.c b/misc.c → src/misc.c
diff --git a/misc.h → src/misc.h b/misc.h → src/misc.h
diff --git a/recurse.c → src/recurse.c b/recurse.c → src/recurse.c
diff --git a/recurse.h → src/recurse.h b/recurse.h → src/recurse.h
diff --git a/wavegain.c → src/wavegain.c b/wavegain.c → src/wavegain.c
diff --git a/wavegain.h → src/wavegain.h b/wavegain.h → src/wavegain.h