summaryrefslogtreecommitdiff
path: root/audio/wavegain/files
diff options
context:
space:
mode:
Diffstat (limited to 'audio/wavegain/files')
-rw-r--r--audio/wavegain/files/patch-audio.c23
-rw-r--r--audio/wavegain/files/patch-audio.h4
-rw-r--r--audio/wavegain/files/patch-main.c44
-rw-r--r--audio/wavegain/files/patch-misc.c12
-rw-r--r--audio/wavegain/files/patch-wavegain.c112
5 files changed, 11 insertions, 184 deletions
diff --git a/audio/wavegain/files/patch-audio.c b/audio/wavegain/files/patch-audio.c
index 5951345a5b52..9de3538df029 100644
--- a/audio/wavegain/files/patch-audio.c
+++ b/audio/wavegain/files/patch-audio.c
@@ -1,7 +1,7 @@
---- audio.c.orig 2020-09-25 07:48:54 UTC
+--- audio.c.orig 2025-06-08 11:07:50 UTC
+++ audio.c
-@@ -32,20 +32,8 @@
- #include <sys/types.h>
+@@ -32,14 +32,6 @@
+ #include <sys/stat.h>
#include <math.h>
-#ifdef _WIN32
@@ -14,19 +14,4 @@
-
#include <fcntl.h>
--#ifndef __MACOSX__
--#include <malloc.h>
--#endif
--
- #include "config.h"
- #include "audio.h"
- #include "i18n.h"
-@@ -642,7 +630,7 @@ int wav_open(FILE *in, wavegain_opt *opt, unsigned cha
- if (!find_gain_chunk(in, &len))
- FSEEK64(in, current_pos, SEEK_SET);
- else {
-- char buf_double[8];
-+ unsigned char buf_double[8];
- opt->gain_chunk = 1;
- fread(buf_double, 1, 8, in);
- opt->gain_scale = READ_D64(buf_double);
+ #ifndef __MACOSX__
diff --git a/audio/wavegain/files/patch-audio.h b/audio/wavegain/files/patch-audio.h
index db4a717f6c63..b5042642ebd8 100644
--- a/audio/wavegain/files/patch-audio.h
+++ b/audio/wavegain/files/patch-audio.h
@@ -1,6 +1,6 @@
---- audio.h.orig 2008-11-11 11:29:08 UTC
+--- audio.h.orig 2025-06-08 11:12:29 UTC
+++ audio.h
-@@ -118,7 +118,7 @@ void raw_close(void *);
+@@ -136,7 +136,7 @@ long wav_ieee_read(void *, double **buffer, int sample
long wav_read(void *, double **buffer, int samples, int fast, int chunk);
long wav_ieee_read(void *, double **buffer, int samples, int fast, int chunk);
diff --git a/audio/wavegain/files/patch-main.c b/audio/wavegain/files/patch-main.c
deleted file mode 100644
index 2cae83cb9c59..000000000000
--- a/audio/wavegain/files/patch-main.c
+++ /dev/null
@@ -1,44 +0,0 @@
---- main.c.orig 2008-08-08 08:48:38 UTC
-+++ main.c
-@@ -178,7 +178,7 @@ int process_files(FILE_LIST* file_list, SETTINGS* sett
- /* Undo previously applied gain */
- if (settings->undo) {
- for (file = file_list; file; file = file->next_file) {
-- if (file->filename == '\0')
-+ if (file->filename == NULL)
- continue;
- if (!write_gains(file->filename, 0, 0, 0, 0, 0, settings)) {
- fprintf(stderr, " Error processing GAIN for file - %s\n", file->filename);
-@@ -191,12 +191,12 @@ int process_files(FILE_LIST* file_list, SETTINGS* sett
- for (file = file_list; file; file = file->next_file) {
- int dc_l;
- int dc_r;
-- if (file->filename == '\0')
-+ if (file->filename == NULL)
- continue;
-
- if (!get_gain(file->filename, &file->track_peak, &file->track_gain,
- file->dc_offset, file->offset, settings)) {
-- file->filename = '\0';
-+ file->filename = NULL;
- continue;
- }
- dc_l = (int)(file->dc_offset[0] * 32768 * -1);
-@@ -262,7 +262,7 @@ int process_files(FILE_LIST* file_list, SETTINGS* sett
- if(settings->apply_gain) { /* Write radio and audiophile gains. */
- total_files = 0.0;
- for (file = file_list; file; file = file->next_file) {
-- if (file->filename == '\0')
-+ if (file->filename == NULL)
- continue;
- if (settings->audiophile && settings->set_album_gain == 1)
- break;
-@@ -297,7 +297,7 @@ int process_files(FILE_LIST* file_list, SETTINGS* sett
- SetEnvironmentVariable("ALBUM_PEAK", ftos(settings->album_peak, "%.0lf"));
-
- for (file = file_list; file; file = file->next_file) {
-- if (file->filename == '\0')
-+ if (file->filename[0] == NULL)
- continue;
-
- if (dir[0] == '.' && dir[1] == '\\') dir += 2;
diff --git a/audio/wavegain/files/patch-misc.c b/audio/wavegain/files/patch-misc.c
deleted file mode 100644
index c71a357f24db..000000000000
--- a/audio/wavegain/files/patch-misc.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- misc.c.orig 2006-06-04 21:47:38 UTC
-+++ misc.c
-@@ -39,8 +39,7 @@ void file_error(const char* message, ...)
- vfprintf(stderr, message, args);
- va_end(args);
-
-- fprintf(stderr, strerror(err_num));
-- fprintf(stderr, "\n");
-+ fprintf(stderr, "%s\n", strerror(err_num));
- }
-
-
diff --git a/audio/wavegain/files/patch-wavegain.c b/audio/wavegain/files/patch-wavegain.c
index 30e76bf945c5..a024043951e8 100644
--- a/audio/wavegain/files/patch-wavegain.c
+++ b/audio/wavegain/files/patch-wavegain.c
@@ -1,11 +1,12 @@
---- wavegain.c.orig 2020-09-25 07:55:21 UTC
+--- wavegain.c.orig 2025-06-08 11:08:36 UTC
+++ wavegain.c
-@@ -19,20 +19,8 @@
- #include <string.h>
+@@ -34,15 +34,6 @@
+ #include <time.h>
#include <ctype.h>
-#ifdef _WIN32
-#include <io.h>
+-#include <process.h>
-#else
-# ifndef __MACOSX__
-# include <sys/io.h>
@@ -14,107 +15,4 @@
-
#include <fcntl.h>
--#ifndef __MACOSX__
--#include <malloc.h>
--#endif
--
- #include "gain_analysis.h"
- #include "i18n.h"
- #include "getopt.h"
-@@ -44,6 +32,8 @@
-
- #ifdef _WIN32
- #include <windows.h>
-+#else
-+#include <unistd.h>
- #endif
-
- #ifdef ENABLE_RECURSIVE
-@@ -57,6 +47,9 @@
- #define ROUND64(x) ( doubletmp = (x) + Dither.Add + (Int64_t)0x001FFFFD80000000L, *(Int64_t*)(&doubletmp) - (Int64_t)0x433FFFFD80000000L )
- #endif
-
-+#include <errno.h>
-+static int xrename(const char *oldpath, const char *newpath);
-+
- extern int write_to_log;
- dither_t Dither;
- double doubletmp;
-@@ -639,7 +632,14 @@ int write_gains(const char *filename, double radio_gai
- goto exit;
- }
-
-- if (rename(TEMP_NAME, filename) != 0) {
-+ /*
-+ * int rename(const char *old, const char *new);
-+ * In POSIX, rename will fail if the 'old' and 'new' names are on different mounted file systems.
-+ * ( From http://en.wikipedia.org/wiki/Rename_%28C%29 )
-+ * Function 'xrename' from 'normalize-0.7.6' is one clever solution
-+ */
-+ /*if (rename(TEMP_NAME, filename) != 0) {*/
-+ if (xrename(TEMP_NAME, filename) != 0) {
- fprintf(stderr, " Error renaming '" TEMP_NAME "' to '%s' (uh-oh)\n", filename);
- goto exit;
- }
-@@ -650,4 +650,61 @@ exit:
- return result;
- }
-
-+/* From normalize-0.7.6/nid3lib/write.c
-+ * Move the file "oldpath" to "newpath", or copy and delete if they
-+ * are on different filesystems.
-+*/
-+static int
-+xrename(const char *oldpath, const char *newpath)
-+{
-+ FILE *in, *out;
-+ char buf[4096];
-+ size_t sz;
-
-+ if (strcmp(oldpath, newpath) == 0)
-+ return 0;
-+
-+#ifdef __EMX__
-+ if (unlink(newpath) == -1 && errno != ENOENT)
-+ return -1;
-+#endif
-+
-+ if (rename(oldpath, newpath) == -1) {
-+ if (errno == EXDEV) {
-+ /* files are on different filesystems, so we have to copy */
-+ if (unlink(newpath) == -1 && errno != ENOENT)
-+ return -1;
-+
-+ in = fopen(oldpath, "rb");
-+ if (in == NULL)
-+ return -1;
-+ out = fopen(newpath, "wb");
-+ if (out == NULL) {
-+ fclose(in);
-+ return -1;
-+ }
-+
-+ while ((sz = fread(buf, 1, 4096, in)) > 0)
-+ fwrite(buf, 1, sz, out);
-+
-+ if (ferror(in) || ferror(out)) {
-+ fclose(in);
-+ fclose(out);
-+ return -1;
-+ }
-+ if (fclose(in) == EOF) {
-+ fclose(out);
-+ return -1;
-+ }
-+ if (fclose(out) == EOF)
-+ return -1;
-+
-+ if (unlink(oldpath) == -1)
-+ return -1;
-+ } else {
-+ return -1;
-+ }
-+ }
-+
-+ return 0;
-+}
+ #ifndef __MACOSX__
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-05 03:33:02 +0000