CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix patched for etiona

Browse source 
Update patches that close #4061 on asunder-2.9.2
This commit is contained in:
Luis Guzman 2019-12-11 12:39:18 -06:00
parent a4733c6590
commit c7eeb06dbc
No known key found for this signature in database
GPG key ID: 35AD8DB3BE2C988C
2 changed files with 426 additions and 396 deletions
Download patch file Download diff file Expand all files Collapse all files

413
helpers/DATA/asunder/asunder.4061-aac.patch → helpers/DATA/asunder/asunder.4062-aac.patch
View file

@ -1,7 +1,7 @@
diff -ruN ../asunder-2.0-orig/src/callbacks.c src/callbacks.c diff -ruN asunder-2.9.2-orig/src/callbacks.c src/callbacks.c
--- ../asunder-2.0-orig/src/callbacks.c 2010-01-23 16:21:15.000000000 +0000 --- asunder-2.9.2-orig/src/callbacks.c 2017-11-18 17:47:03.000000000 -0600
+++ src/callbacks.c 2011-11-08 18:10:15.000000000 +0000 +++ src/callbacks.c 2019-12-11 03:47:37.748518768 -0600
@@ -510,31 +510,6 @@ @@ -719,31 +719,6 @@
} }
void void
@ -33,10 +33,10 @@ diff -ruN ../asunder-2.0-orig/src/callbacks.c src/callbacks.c
on_rip_musepack_toggled (GtkToggleButton *togglebutton, on_rip_musepack_toggled (GtkToggleButton *togglebutton,
gpointer user_data) gpointer user_data)
{ {
diff -ruN ../asunder-2.0-orig/src/callbacks.h src/callbacks.h diff -ruN asunder-2.9.2-orig/src/callbacks.h src/callbacks.h
--- ../asunder-2.0-orig/src/callbacks.h 2010-01-23 16:21:15.000000000 +0000 --- asunder-2.9.2-orig/src/callbacks.h 2017-11-18 16:13:26.000000000 -0600
+++ src/callbacks.h 2011-11-08 18:20:03.000000000 +0000 +++ src/callbacks.h 2019-12-11 03:47:37.776519106 -0600
@@ -164,9 +164,6 @@ @@ -160,9 +160,6 @@
on_rip_monkey_toggled (GtkToggleButton *togglebutton, on_rip_monkey_toggled (GtkToggleButton *togglebutton,
gpointer user_data); gpointer user_data);
void void
@ -46,10 +46,10 @@ diff -ruN ../asunder-2.0-orig/src/callbacks.h src/callbacks.h
on_rip_musepack_toggled (GtkToggleButton *togglebutton, on_rip_musepack_toggled (GtkToggleButton *togglebutton,
gpointer user_data); gpointer user_data);
void void
diff -ruN ../asunder-2.0-orig/src/interface.c src/interface.c diff -ruN asunder-2.9.2-orig/src/interface.c src/interface.c
--- ../asunder-2.0-orig/src/interface.c 2010-07-17 11:44:06.000000000 +0000 --- asunder-2.9.2-orig/src/interface.c 2017-11-19 15:36:39.000000000 -0600
+++ src/interface.c 2011-11-08 18:09:31.000000000 +0000 +++ src/interface.c 2019-12-11 03:47:37.784519202 -0600
@@ -863,61 +863,6 @@ @@ -943,62 +943,7 @@
GLADE_HOOKUP_OBJECT (prefs, rip_monkey, "rip_monkey"); GLADE_HOOKUP_OBJECT (prefs, rip_monkey, "rip_monkey");
/* END MONKEY */ /* END MONKEY */
@ -68,6 +68,7 @@ diff -ruN ../asunder-2.0-orig/src/interface.c src/interface.c
- GtkWidget* aacVbox; - GtkWidget* aacVbox;
- -
- frame8 = gtk_frame_new (NULL); - frame8 = gtk_frame_new (NULL);
- gtk_frame_set_shadow_type(GTK_FRAME(frame8), GTK_SHADOW_IN);
- gtk_widget_show (frame8); - gtk_widget_show (frame8);
- gtk_box_pack_start (GTK_BOX (hiddenbox), frame8, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (hiddenbox), frame8, FALSE, FALSE, 0);
- -
@ -108,10 +109,11 @@ diff -ruN ../asunder-2.0-orig/src/interface.c src/interface.c
- GLADE_HOOKUP_OBJECT (prefs, rip_aac, "rip_aac"); - GLADE_HOOKUP_OBJECT (prefs, rip_aac, "rip_aac");
- /* END AAC */ - /* END AAC */
- -
+
label = gtk_label_new (_("Encode")); label = gtk_label_new (_("Encode"));
gtk_widget_show (label); gtk_widget_show (label);
gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 2), label); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 2), label);
@@ -1297,18 +1242,6 @@ @@ -1400,18 +1345,6 @@
gtk_widget_set_sensitive(lookup_widget(win_prefs, "monkey_compression_slider"), TRUE); gtk_widget_set_sensitive(lookup_widget(win_prefs, "monkey_compression_slider"), TRUE);
} }
@ -130,20 +132,20 @@ diff -ruN ../asunder-2.0-orig/src/interface.c src/interface.c
void disable_musepack_widgets(void) void disable_musepack_widgets(void)
{ {
gtk_widget_set_sensitive(lookup_widget(win_prefs, "musepack_bitrate_lbl"), FALSE); gtk_widget_set_sensitive(lookup_widget(win_prefs, "musepack_bitrate_lbl"), FALSE);
@@ -1545,8 +1478,7 @@ @@ -1789,8 +1722,7 @@
static const char* static const char*
GBLcomments = GBLcomments =
N_("An application to save tracks from an Audio CD \n" N_("An application to save tracks from an Audio CD \n"
-"as WAV, MP3, OGG, FLAC, Wavpack, Musepack, Monkey's Audio, and/or " -"as WAV, MP3, OGG, FLAC, Wavpack, Opus, Musepack, Monkey's Audio, and/or "
-"AAC files."); -"AAC files.");
+"as WAV, MP3, OGG, FLAC, Wavpack, Musepack, Monkey's Audio files "); +"as WAV, MP3, OGG, FLAC, Wavpack, Musepack, Monkey's Audio files ");
static const char* static const char*
GBLcopyright = GBLcopyright =
diff -ruN ../asunder-2.0-orig/src/interface.h src/interface.h diff -ruN asunder-2.9.2-orig/src/interface.h src/interface.h
--- ../asunder-2.0-orig/src/interface.h 2009-08-25 01:32:28.000000000 +0000 --- asunder-2.9.2-orig/src/interface.h 2017-11-18 16:13:26.000000000 -0600
+++ src/interface.h 2011-11-08 18:08:28.000000000 +0000 +++ src/interface.h 2019-12-11 03:47:37.788519251 -0600
@@ -15,8 +15,6 @@ @@ -17,8 +17,6 @@
void enable_wavpack_widgets(void); void enable_wavpack_widgets(void);
void disable_monkey_widgets(void); void disable_monkey_widgets(void);
void enable_monkey_widgets(void); void enable_monkey_widgets(void);
@ -151,11 +153,11 @@ diff -ruN ../asunder-2.0-orig/src/interface.h src/interface.h
-void enable_aac_widgets(void); -void enable_aac_widgets(void);
void disable_musepack_widgets(void); void disable_musepack_widgets(void);
void enable_musepack_widgets(void); void enable_musepack_widgets(void);
#if GTK_MINOR_VERSION >= 6 void show_aboutbox (void);
diff -ruN ../asunder-2.0-orig/src/prefs.c src/prefs.c diff -ruN asunder-2.9.2-orig/src/prefs.c src/prefs.c
--- ../asunder-2.0-orig/src/prefs.c 2009-08-25 01:32:28.000000000 +0000 --- asunder-2.9.2-orig/src/prefs.c 2017-11-04 21:41:13.000000000 -0600
+++ src/prefs.c 2011-11-08 18:14:40.000000000 +0000 +++ src/prefs.c 2019-12-11 03:47:37.788519251 -0600
@@ -122,8 +122,6 @@ @@ -127,8 +127,6 @@
p->wavpack_bitrate = 3; p->wavpack_bitrate = 3;
p->rip_monkey = 0; p->rip_monkey = 0;
p->monkey_compression = 2; p->monkey_compression = 2;
@ -163,8 +165,8 @@ diff -ruN ../asunder-2.0-orig/src/prefs.c src/prefs.c
- p->aac_quality = 60; - p->aac_quality = 60;
p->rip_musepack = 0; p->rip_musepack = 0;
p->musepack_bitrate = 2; p->musepack_bitrate = 2;
p->rip_opus = 0;
@@ -184,8 +182,6 @@ @@ -193,8 +191,6 @@
gtk_range_set_value(GTK_RANGE(lookup_widget(win_prefs, "wavpack_bitrate_slider")), p->wavpack_bitrate); gtk_range_set_value(GTK_RANGE(lookup_widget(win_prefs, "wavpack_bitrate_slider")), p->wavpack_bitrate);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_monkey")), p->rip_monkey); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_monkey")), p->rip_monkey);
gtk_range_set_value(GTK_RANGE(lookup_widget(win_prefs, "monkey_compression_slider")), p->monkey_compression); gtk_range_set_value(GTK_RANGE(lookup_widget(win_prefs, "monkey_compression_slider")), p->monkey_compression);
@ -172,8 +174,8 @@ diff -ruN ../asunder-2.0-orig/src/prefs.c src/prefs.c
- gtk_range_set_value(GTK_RANGE(lookup_widget(win_prefs, "aac_quality_slider")), p->aac_quality); - gtk_range_set_value(GTK_RANGE(lookup_widget(win_prefs, "aac_quality_slider")), p->aac_quality);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_musepack")), p->rip_musepack); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_musepack")), p->rip_musepack);
gtk_range_set_value(GTK_RANGE(lookup_widget(win_prefs, "musepack_bitrate_slider")), p->musepack_bitrate); gtk_range_set_value(GTK_RANGE(lookup_widget(win_prefs, "musepack_bitrate_slider")), p->musepack_bitrate);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "eject_on_done")), p->eject_on_done); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_opus")), p->rip_opus);
@@ -216,8 +212,6 @@ @@ -227,8 +223,6 @@
enable_wavpack_widgets(); /* need this to potentially disable hybrid widgets */ enable_wavpack_widgets(); /* need this to potentially disable hybrid widgets */
if( !(p->rip_monkey) ) if( !(p->rip_monkey) )
disable_monkey_widgets(); disable_monkey_widgets();
@ -181,8 +183,8 @@ diff -ruN ../asunder-2.0-orig/src/prefs.c src/prefs.c
- disable_aac_widgets(); - disable_aac_widgets();
if( !(p->rip_musepack) ) if( !(p->rip_musepack) )
disable_musepack_widgets(); disable_musepack_widgets();
} if (!(p->rip_opus))
@@ -275,8 +269,6 @@ @@ -289,8 +283,6 @@
p->wavpack_bitrate = (int)gtk_range_get_value(GTK_RANGE(lookup_widget(win_prefs, "wavpack_bitrate_slider"))); p->wavpack_bitrate = (int)gtk_range_get_value(GTK_RANGE(lookup_widget(win_prefs, "wavpack_bitrate_slider")));
p->rip_monkey = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_monkey"))); p->rip_monkey = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_monkey")));
p->monkey_compression = (int)gtk_range_get_value(GTK_RANGE(lookup_widget(win_prefs, "monkey_compression_slider"))); p->monkey_compression = (int)gtk_range_get_value(GTK_RANGE(lookup_widget(win_prefs, "monkey_compression_slider")));
@ -190,8 +192,8 @@ diff -ruN ../asunder-2.0-orig/src/prefs.c src/prefs.c
- p->aac_quality = (int)gtk_range_get_value(GTK_RANGE(lookup_widget(win_prefs, "aac_quality_slider"))); - p->aac_quality = (int)gtk_range_get_value(GTK_RANGE(lookup_widget(win_prefs, "aac_quality_slider")));
p->rip_musepack = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_musepack"))); p->rip_musepack = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_musepack")));
p->musepack_bitrate = (int)gtk_range_get_value(GTK_RANGE(lookup_widget(win_prefs, "musepack_bitrate_slider"))); p->musepack_bitrate = (int)gtk_range_get_value(GTK_RANGE(lookup_widget(win_prefs, "musepack_bitrate_slider")));
p->rip_opus = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_opus")));
@@ -358,8 +350,6 @@ @@ -439,8 +431,6 @@
fprintf(config, "%d\n", p->cddb_port_number); fprintf(config, "%d\n", p->cddb_port_number);
fprintf(config, "%d\n", p->rip_monkey); fprintf(config, "%d\n", p->rip_monkey);
fprintf(config, "%d\n", p->monkey_compression); fprintf(config, "%d\n", p->monkey_compression);
@ -200,7 +202,7 @@ diff -ruN ../asunder-2.0-orig/src/prefs.c src/prefs.c
fprintf(config, "%d\n", p->rip_musepack); fprintf(config, "%d\n", p->rip_musepack);
fprintf(config, "%d\n", p->musepack_bitrate); fprintf(config, "%d\n", p->musepack_bitrate);
fprintf(config, "%d\n", p->more_formats_expanded); fprintf(config, "%d\n", p->more_formats_expanded);
@@ -537,12 +527,6 @@ @@ -614,12 +604,6 @@
p->monkey_compression = read_line_num(fd); p->monkey_compression = read_line_num(fd);
// this one can be 0 // this one can be 0
@ -213,9 +215,9 @@ diff -ruN ../asunder-2.0-orig/src/prefs.c src/prefs.c
p->rip_musepack = read_line_num(fd); p->rip_musepack = read_line_num(fd);
// this one can be 0 // this one can be 0
diff -ruN ../asunder-2.0-orig/src/prefs.h src/prefs.h diff -ruN asunder-2.9.2-orig/src/prefs.h src/prefs.h
--- ../asunder-2.0-orig/src/prefs.h 2009-09-01 03:22:41.000000000 +0000 --- asunder-2.9.2-orig/src/prefs.h 2015-01-02 14:51:46.000000000 -0600
+++ src/prefs.h 2011-11-08 18:20:15.000000000 +0000 +++ src/prefs.h 2019-12-11 03:47:37.788519251 -0600
@@ -34,8 +34,6 @@ @@ -34,8 +34,6 @@
int cddb_port_number; int cddb_port_number;
int rip_monkey; int rip_monkey;
@ -225,10 +227,10 @@ diff -ruN ../asunder-2.0-orig/src/prefs.h src/prefs.h
int rip_musepack; int rip_musepack;
int musepack_bitrate; int musepack_bitrate;
int more_formats_expanded; int more_formats_expanded;
diff -ruN ../asunder-2.0-orig/src/threads.c src/threads.c diff -ruN asunder-2.9.2-orig/src/threads.c src/threads.c
--- ../asunder-2.0-orig/src/threads.c 2010-05-01 22:27:47.000000000 +0000 --- asunder-2.9.2-orig/src/threads.c 2017-11-18 18:58:43.000000000 -0600
+++ src/threads.c 2011-11-08 18:21:22.000000000 +0000 +++ src/threads.c 2019-12-11 10:11:03.183303965 -0600
@@ -39,7 +39,6 @@ @@ -41,7 +41,6 @@
static FILE * playlist_wavpack = NULL; static FILE * playlist_wavpack = NULL;
static FILE * playlist_monkey = NULL; static FILE * playlist_monkey = NULL;
static FILE * playlist_musepack = NULL; static FILE * playlist_musepack = NULL;
@ -236,7 +238,7 @@ diff -ruN ../asunder-2.0-orig/src/threads.c src/threads.c
/* ripping or encoding, so that can know not to clear the tracklist on eject */ /* ripping or encoding, so that can know not to clear the tracklist on eject */
bool working; bool working;
@@ -60,7 +59,6 @@ @@ -63,7 +62,6 @@
static double wavpack_percent; static double wavpack_percent;
static double monkey_percent; static double monkey_percent;
static double musepack_percent; static double musepack_percent;
@ -244,33 +246,33 @@ diff -ruN ../asunder-2.0-orig/src/threads.c src/threads.c
static int rip_tracks_completed; static int rip_tracks_completed;
static int encode_tracks_completed; static int encode_tracks_completed;
@@ -86,13 +84,11 @@ @@ -92,13 +90,11 @@
kill(monkey_pid, SIGKILL); kill(pid, SIGKILL);
if (musepack_pid != 0) if ((pid = musepack_pid) != 0)
kill(musepack_pid, SIGKILL); kill(pid, SIGKILL);
- if (aac_pid != 0) - if ((pid = aac_pid) != 0)
- kill(aac_pid, SIGKILL); - kill(pid, SIGKILL);
/* wait until all the worker threads are done */ /* wait until all the worker threads are done */
while (cdparanoia_pid != 0 || lame_pid != 0 || oggenc_pid != 0 || while (cdparanoia_pid != 0 || lame_pid != 0 || oggenc_pid != 0 ||
flac_pid != 0 || wavpack_pid != 0 || monkey_pid != 0 || opusenc_pid != 0 || flac_pid != 0 || wavpack_pid != 0 || monkey_pid != 0 ||
- musepack_pid != 0 || aac_pid != 0) - musepack_pid != 0 || aac_pid != 0)
+ musepack_pid != 0) + musepack_pid != 0)
{ {
debugLog("w1"); debugLog("w1");
usleep(100000); usleep(100000);
@@ -114,8 +110,8 @@ @@ -120,8 +116,8 @@
gdk_flush(); gdk_flush();
working = false; working = false;
- show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numFlacOk + numWavpackOk + numMonkeyOk + numMusepackOk + numAacOk, - show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numOpusOk + numFlacOk + numWavpackOk + numMonkeyOk + numMusepackOk + numAacOk,
- numCdparanoiaFailed + numLameFailed + numOggFailed + numFlacFailed + numWavpackFailed + numMonkeyFailed + numMusepackFailed + numAacFailed); - numCdparanoiaFailed + numLameFailed + numOggFailed + numOpusFailed + numFlacFailed + numWavpackFailed + numMonkeyFailed + numMusepackFailed + numAacFailed);
+ show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numFlacOk + numWavpackOk + numMonkeyOk + numMusepackOk , + show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numOpusOk + numFlacOk + numWavpackOk + numMonkeyOk + numMusepackOk,
+ numCdparanoiaFailed + numLameFailed + numOggFailed + numFlacFailed + numWavpackFailed + numMonkeyFailed + numMusepackFailed ); + numCdparanoiaFailed + numLameFailed + numOggFailed + numOpusFailed + numFlacFailed + numWavpackFailed + numMonkeyFailed + numMusepackFailed);
} }
// spawn needed threads and begin ripping // spawn needed threads and begin ripping
@@ -134,7 +130,6 @@ @@ -146,7 +142,6 @@
wavpack_percent = 0.0; wavpack_percent = 0.0;
monkey_percent = 0.0; monkey_percent = 0.0;
musepack_percent = 0.0; musepack_percent = 0.0;
@ -278,16 +280,16 @@ diff -ruN ../asunder-2.0-orig/src/threads.c src/threads.c
rip_tracks_completed = 0; rip_tracks_completed = 0;
encode_tracks_completed = 0; encode_tracks_completed = 0;
@@ -161,7 +156,7 @@ @@ -178,7 +173,7 @@
// make sure there's at least one format to rip to // make sure there's at least one format to rip to
if (!global_prefs->rip_wav && !global_prefs->rip_mp3 && !global_prefs->rip_ogg && if (!global_prefs->rip_wav && !global_prefs->rip_mp3 && !global_prefs->rip_ogg && !global_prefs->rip_opus &&
!global_prefs->rip_flac && !global_prefs->rip_wavpack && !global_prefs->rip_monkey && !global_prefs->rip_flac && !global_prefs->rip_wavpack && !global_prefs->rip_monkey &&
- !global_prefs->rip_musepack && !global_prefs->rip_aac) - !global_prefs->rip_musepack && !global_prefs->rip_aac)
+ !global_prefs->rip_musepack) + !global_prefs->rip_musepack)
{ {
GtkWidget * dialog; GtkWidget * dialog;
dialog = gtk_message_dialog_new(GTK_WINDOW(win_main), dialog = gtk_message_dialog_new(GTK_WINDOW(win_main),
@@ -291,14 +286,6 @@ @@ -327,14 +322,6 @@
free(filename); free(filename);
} }
@ -295,14 +297,14 @@ diff -ruN ../asunder-2.0-orig/src/threads.c src/threads.c
- { - {
- char * filename = make_filename(prefs_get_music_dir(global_prefs), albumdir, playlist, "m4a.m3u"); - char * filename = make_filename(prefs_get_music_dir(global_prefs), albumdir, playlist, "m4a.m3u");
- -
- make_playlist(filename, &playlist_monkey); - make_playlist(filename, &playlist_aac);
- -
- free(filename); - free(filename);
- } - }
} }
free(albumdir); free(albumdir);
@@ -313,7 +300,6 @@ @@ -353,7 +340,6 @@
numWavpackFailed = 0; numWavpackFailed = 0;
numMonkeyFailed = 0; numMonkeyFailed = 0;
numMusepackFailed = 0; numMusepackFailed = 0;
@ -310,7 +312,7 @@ diff -ruN ../asunder-2.0-orig/src/threads.c src/threads.c
numCdparanoiaOk = 0; numCdparanoiaOk = 0;
numLameOk = 0; numLameOk = 0;
@@ -322,7 +308,6 @@ @@ -363,7 +349,6 @@
numWavpackOk = 0; numWavpackOk = 0;
numMonkeyOk = 0; numMonkeyOk = 0;
numMusepackOk = 0; numMusepackOk = 0;
@ -318,31 +320,49 @@ diff -ruN ../asunder-2.0-orig/src/threads.c src/threads.c
ripper = g_thread_create(rip, NULL, TRUE, NULL); ripper = g_thread_create(rip, NULL, TRUE, NULL);
encoder = g_thread_create(encode, NULL, TRUE, NULL); encoder = g_thread_create(encode, NULL, TRUE, NULL);
@@ -461,7 +446,6 @@ @@ -545,9 +530,6 @@
char* wavpackfilename2 = NULL; if (playlist_musepack)
char* monkeyfilename = NULL; fclose(playlist_musepack);
char* musepackfilename = NULL; playlist_musepack = NULL;
- char* aacfilename = NULL; - if (playlist_aac)
struct stat statStruct; - fclose(playlist_aac);
bool doEncode; - playlist_aac = NULL;
@@ -541,7 +525,6 @@
wavpackfilename2 = make_filename(prefs_get_music_dir(global_prefs), albumdir, musicfilename, "wvc");
monkeyfilename = make_filename(prefs_get_music_dir(global_prefs), albumdir, musicfilename, "ape");
musepackfilename = make_filename(prefs_get_music_dir(global_prefs), albumdir, musicfilename, "mpc");
- aacfilename = make_filename(prefs_get_music_dir(global_prefs), albumdir, musicfilename, "m4a");
if (global_prefs->rip_mp3)
{
@@ -745,41 +728,6 @@
fflush(playlist_musepack);
} }
// the thread that handles encoding WAV files to all other formats
@@ -1088,65 +1070,6 @@
}
free(musepackfilename);
} }
- if (global_prefs->rip_aac) - if (global_prefs->rip_aac)
- { - {
- debugLog("Encoding track %d to \"%s\"\n", tracknum, aacfilename); - if (aborted)
- {
- free(albumdir);
- free(musicfilename);
- free(wavfilename);
- free(trackartist_trimmed);
- free(tracktitle_trimmed);
- -
- if (aborted) g_thread_exit(NULL); - free(trackartist);
- free(tracktitle);
- free(tracktime);
-
- free(album_artist);
- free(album_title);
- free(album_genre);
- free(album_year);
- free(album_artist_trimmed);
- free(album_title_trimmed);
- free(album_genre_trimmed);
-
- close_playlists();
- return NULL;
- }
-
- char * aacfilename = make_filename(prefs_get_music_dir(global_prefs), albumdir, musicfilename, "m4a");
- snprintf(logStr, 1024, "Encoding track %d to \"%s\"\n", tracknum, aacfilename);
- debugLog(logStr);
- -
- rc = stat(aacfilename, &statStruct); - rc = stat(aacfilename, &statStruct);
- if(rc == 0) - if(rc == 0)
@ -359,32 +379,24 @@ diff -ruN ../asunder-2.0-orig/src/threads.c src/threads.c
- -
- if(doEncode) - if(doEncode)
- { - {
- aac(wavfilename, aacfilename, - aac(tracknum, trackartist, album_title, tracktitle, album_genre, album_year,
- wavfilename, aacfilename,
- global_prefs->aac_quality, - global_prefs->aac_quality,
- &aac_percent); - &aac_percent);
- } - }
- -
- if (aborted) g_thread_exit(NULL);
-
- if (playlist_aac) - if (playlist_aac)
- { - {
- fprintf(playlist_aac, "#EXTINF:%d,%s - %s\n", (min*60)+sec, trackartist, tracktitle); - fprintf(playlist_aac, "#EXTINF:%d,%s - %s\n", (min*60)+sec, trackartist, tracktitle);
- fprintf(playlist_aac, "%s\n", basename(aacfilename)); - fprintf(playlist_aac, "%s\n", basename(aacfilename));
- fflush(playlist_aac); - fflush(playlist_aac);
- } - }
- free(aacfilename);
- } - }
if (!global_prefs->rip_wav) if (!global_prefs->rip_wav)
{ {
debugLog("Removing track %d WAV file\n", tracknum); snprintf(logStr, 1024, "Removing track %d WAV file\n", tracknum);
@@ -806,7 +754,6 @@ @@ -1179,7 +1102,6 @@
free(wavpackfilename);
free(monkeyfilename);
free(musepackfilename);
- free(aacfilename);
mp3_percent = 0.0;
ogg_percent = 0.0;
@@ -814,7 +761,6 @@
wavpack_percent = 0.0; wavpack_percent = 0.0;
monkey_percent = 0.0; monkey_percent = 0.0;
musepack_percent = 0.0; musepack_percent = 0.0;
@ -392,36 +404,27 @@ diff -ruN ../asunder-2.0-orig/src/threads.c src/threads.c
encode_tracks_completed++; encode_tracks_completed++;
} }
@@ -843,8 +789,6 @@ @@ -1224,7 +1146,7 @@
playlist_monkey = NULL;
if (playlist_musepack) fclose(playlist_musepack);
playlist_musepack = NULL;
- if (playlist_aac) fclose(playlist_aac);
- playlist_aac = NULL;
g_mutex_free(barrier);
barrier = NULL;
@@ -854,7 +798,7 @@
/* wait until all the worker threads are done */ /* wait until all the worker threads are done */
while (cdparanoia_pid != 0 || lame_pid != 0 || oggenc_pid != 0 || while (cdparanoia_pid != 0 || lame_pid != 0 || oggenc_pid != 0 ||
flac_pid != 0 || wavpack_pid != 0 || monkey_pid != 0 || opusenc_pid != 0 || flac_pid != 0 || wavpack_pid != 0 || monkey_pid != 0 ||
- musepack_pid != 0 || aac_pid != 0) - musepack_pid != 0 || aac_pid != 0)
+ musepack_pid != 0) + musepack_pid != 0)
{ {
debugLog("w2"); debugLog("w2");
usleep(100000); usleep(100000);
@@ -867,8 +811,8 @@ @@ -1243,8 +1165,8 @@
gtk_widget_hide(win_ripping); eject_disc(global_prefs->cdrom);
gdk_flush(); }
- show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numFlacOk + numWavpackOk + numMonkeyOk + numMusepackOk + numAacOk, - show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numOpusOk + numFlacOk + numWavpackOk + numMonkeyOk + numMusepackOk + numAacOk,
- numCdparanoiaFailed + numLameFailed + numOggFailed + numFlacFailed + numWavpackFailed + numMonkeyFailed + numMusepackFailed + numAacFailed); - numCdparanoiaFailed + numLameFailed + numOggFailed + numOpusFailed + numFlacFailed + numWavpackFailed + numMonkeyFailed + numMusepackFailed + numAacFailed);
+ show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numFlacOk + numWavpackOk + numMonkeyOk + numMusepackOk , + show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numOpusOk + numFlacOk + numWavpackOk + numMonkeyOk + numMusepackOk,
+ numCdparanoiaFailed + numLameFailed + numOggFailed + numFlacFailed + numWavpackFailed + numMonkeyFailed + numMusepackFailed ); + numCdparanoiaFailed + numLameFailed + numOggFailed + numOpusFailed + numFlacFailed + numWavpackFailed + numMonkeyFailed + numMusepackFailed );
gdk_threads_leave(); gdk_threads_leave();
return NULL; return NULL;
@@ -890,8 +834,6 @@ @@ -1269,8 +1191,6 @@
parts++; parts++;
if(global_prefs->rip_musepack) if(global_prefs->rip_musepack)
parts++; parts++;
@ -430,32 +433,32 @@ diff -ruN ../asunder-2.0-orig/src/threads.c src/threads.c
gdk_threads_enter(); gdk_threads_enter();
GtkProgressBar * progress_total = GTK_PROGRESS_BAR(lookup_widget(win_ripping, "progress_total")); GtkProgressBar * progress_total = GTK_PROGRESS_BAR(lookup_widget(win_ripping, "progress_total"));
@@ -926,10 +868,10 @@ @@ -1314,7 +1234,7 @@
debugLog("completed tracks %d, rip %.2lf%%; encoded tracks %d, "
"mp3 %.2lf%% ogg %.2lf%% flac %.2lf%% wavpack %.2lf%% "
- "monkey %.2lf%% musepack %.2lf%% aac %.2lf%%\n\n",
+ "monkey %.2lf%% musepack %.2lf%% \n\n",
rip_tracks_completed, rip_percent*100, encode_tracks_completed,
mp3_percent*100, ogg_percent*100, flac_percent*100, wavpack_percent*100,
- monkey_percent*100,musepack_percent*100,aac_percent*100);
+ monkey_percent*100,musepack_percent*100);
prip = (rip_tracks_completed+rip_percent) / tracks_to_rip;
snprintf(srip, 13, "%d%% (%d/%d)", (int)(prip*100),
@@ -941,7 +883,7 @@
{ {
pencode = ((double)encode_tracks_completed/(double)tracks_to_rip) + pencode = ((double)encode_tracks_completed/(double)tracks_to_rip) +
((mp3_percent+ogg_percent+flac_percent+wavpack_percent+monkey_percent ((mp3_percent+ogg_percent+flac_percent+wavpack_percent+monkey_percent
- +musepack_percent+aac_percent) / - +opus_percent+musepack_percent+aac_percent) /
+ +musepack_percent) / + +opus_percent+musepack_percent) /
(parts-1) / tracks_to_rip); (parts-1) / tracks_to_rip);
snprintf(sencode, 13, "%d%% (%d/%d)", (int)(pencode*100), snprintf(sencode, 13, "%d%% (%d/%d)", (int)(pencode*100),
(encode_tracks_completed < tracks_to_rip) (encode_tracks_completed < tracks_to_rip)
diff -ruN ../asunder-2.0-orig/src/wrappers.c src/wrappers.c @@ -1350,10 +1270,10 @@
--- ../asunder-2.0-orig/src/wrappers.c 2010-07-17 12:13:29.000000000 +0000 if ((looper % 20) == 0) {
+++ src/wrappers.c 2011-11-08 18:19:07.000000000 +0000 snprintf(logStr, 1024, "completed tracks %d, rip %.2lf%%; encoded tracks %d, "
@@ -34,7 +34,6 @@ "mp3 %.2lf%% ogg %.2lf%% opus %.2lf%% flac %.2lf%% wavpack %.2lf%% "
- "monkey %.2lf%% musepack %.2lf%% aac %.2lf%%; prip %.2lf%% pencode %.2lf%%\n",
+ "monkey %.2lf%% musepack %.2lf%% prip %.2lf%% pencode %.2lf%%\n",
rip_tracks_completed, rip_percent*100, encode_tracks_completed,
mp3_percent*100, ogg_percent*100, opus_percent*100, flac_percent*100, wavpack_percent*100,
- monkey_percent*100,musepack_percent*100,aac_percent*100,
+ monkey_percent*100,musepack_percent*100,
prip*100, pencode*100);
debugLog(logStr);
}
diff -ruN asunder-2.9.2-orig/src/wrappers.c src/wrappers.c
--- asunder-2.9.2-orig/src/wrappers.c 2017-11-18 19:08:48.000000000 -0600
+++ src/wrappers.c 2019-12-11 11:11:22.457016117 -0600
@@ -37,7 +37,6 @@
pid_t wavpack_pid; pid_t wavpack_pid;
pid_t monkey_pid; pid_t monkey_pid;
pid_t musepack_pid; pid_t musepack_pid;
@ -463,7 +466,7 @@ diff -ruN ../asunder-2.0-orig/src/wrappers.c src/wrappers.c
int numCdparanoiaFailed; int numCdparanoiaFailed;
int numLameFailed; int numLameFailed;
@@ -43,7 +42,6 @@ @@ -47,7 +46,6 @@
int numWavpackFailed; int numWavpackFailed;
int numMonkeyFailed; int numMonkeyFailed;
int numMusepackFailed; int numMusepackFailed;
@ -471,7 +474,7 @@ diff -ruN ../asunder-2.0-orig/src/wrappers.c src/wrappers.c
int numCdparanoiaOk; int numCdparanoiaOk;
int numLameOk; int numLameOk;
@@ -52,7 +50,6 @@ @@ -57,7 +55,6 @@
int numWavpackOk; int numWavpackOk;
int numMonkeyOk; int numMonkeyOk;
int numMusepackOk; int numMusepackOk;
@ -479,36 +482,15 @@ diff -ruN ../asunder-2.0-orig/src/wrappers.c src/wrappers.c
int numchildren = 0; int numchildren = 0;
static bool waitBeforeSigchld; static bool waitBeforeSigchld;
@@ -89,7 +86,6 @@ @@ -95,7 +92,6 @@
extern pid_t wavpack_pid; extern pid_t wavpack_pid;
extern pid_t monkey_pid; extern pid_t monkey_pid;
extern pid_t musepack_pid; extern pid_t musepack_pid;
-extern pid_t aac_pid; -extern pid_t aac_pid;
// signal handler to find out when our child has exited // Signal handler to find out when our child has exited.
void sigchld(int signum) // Do not pot any printf or syslog into here, it causes a deadlock.
@@ -100,9 +96,9 @@ @@ -154,11 +150,6 @@
pid = wait(&status);
debugLog("sigchld for %d (know about wav %d, mp3 %d, ogg %d, flac %d, "
- "wv %d, ape %d, mpc %d, m4a %d\n",
+ "wv %d, ape %d, mpc %d\n",
pid, cdparanoia_pid, lame_pid, oggenc_pid, flac_pid,
- wavpack_pid, monkey_pid, musepack_pid, aac_pid);
+ wavpack_pid, monkey_pid, musepack_pid);
/* this is because i can't seem to be able to block sigchld: */
while(waitBeforeSigchld)
@@ -113,7 +109,7 @@
if (pid != cdparanoia_pid && pid != lame_pid && pid != oggenc_pid &&
pid != flac_pid && pid != wavpack_pid && pid != monkey_pid &&
- pid != musepack_pid && pid != aac_pid)
+ pid != musepack_pid )
{
printf("SIGCHLD for unknown pid, report bug please");
}
@@ -166,11 +162,6 @@
musepack_pid = 0; musepack_pid = 0;
numMusepackFailed++; numMusepackFailed++;
} }
@ -520,7 +502,7 @@ diff -ruN ../asunder-2.0-orig/src/wrappers.c src/wrappers.c
} }
else else
{ {
@@ -210,11 +201,6 @@ @@ -203,11 +194,6 @@
musepack_pid = 0; musepack_pid = 0;
numMusepackOk++; numMusepackOk++;
} }
@ -530,20 +512,28 @@ diff -ruN ../asunder-2.0-orig/src/wrappers.c src/wrappers.c
- numAacOk++; - numAacOk++;
- } - }
} }
debugLog("sigchld completed\n");
@@ -981,50 +967,3 @@
}
} }
-void aac(char* wavfilename, @@ -1344,119 +1330,3 @@
- char* aacfilename, *progress = 1;
}
-void aac(int tracknum,
- const char * artist,
- const char * album,
- const char * title,
- const char * genre,
- const char * year,
- const char* wavfilename,
- const char* aacfilename,
- int quality, - int quality,
- double* progress) - double* progress)
-{ -{
- const char* args[8]; - const char* args[9];
- char* dynamic_args[6];
- int fd; - int fd;
- int pos; - int pos;
- int dyn_pos;
- -
- pos = 0; - pos = 0;
- args[pos++] = "neroAacEnc"; - args[pos++] = "neroAacEnc";
@ -559,7 +549,7 @@ diff -ruN ../asunder-2.0-orig/src/wrappers.c src/wrappers.c
- args[pos++] = aacfilename; - args[pos++] = aacfilename;
- args[pos++] = NULL; - args[pos++] = NULL;
- -
- fd = exec_with_output(args, STDERR_FILENO, &aac_pid); - fd = exec_with_output(args, STDERR_FILENO, &aac_pid, NULL);
- -
- int size; - int size;
- char buf[256]; - char buf[256];
@ -579,14 +569,75 @@ diff -ruN ../asunder-2.0-orig/src/wrappers.c src/wrappers.c
- /* don't go on until the signal for the previous call is handled */ - /* don't go on until the signal for the previous call is handled */
- while (aac_pid != 0) - while (aac_pid != 0)
- { - {
- debugLog("w11 (%d)\n", aac_pid); - debugLog("w11\n");
- usleep(100000); - usleep(100000);
- } - }
-
- /* Now add tags to the encoded track */
-
- pos = 0;
- args[pos++] = "neroAacTag";
-
- args[pos++] = aacfilename;
-
- dyn_pos = 0;
- if (asprintf(&dynamic_args[dyn_pos], "-meta:artist=%s", artist) > 0)
- {
- args[pos++] = dynamic_args[dyn_pos++];
- } - }
diff -ruN ../asunder-2.0-orig/src/wrappers.h src/wrappers.h - if (asprintf(&dynamic_args[dyn_pos], "-meta:title=%s", title) > 0)
--- ../asunder-2.0-orig/src/wrappers.h 2010-04-16 01:15:02.000000000 +0000 - {
+++ src/wrappers.h 2011-11-08 18:19:37.000000000 +0000 - args[pos++] = dynamic_args[dyn_pos++];
@@ -8,7 +8,6 @@ - }
- if (asprintf(&dynamic_args[dyn_pos], "-meta:album=%s", album) > 0)
- {
- args[pos++] = dynamic_args[dyn_pos++];
- }
- if (asprintf(&dynamic_args[dyn_pos], "-meta:year=%s", year) > 0)
- {
- args[pos++] = dynamic_args[dyn_pos++];
- }
- if (asprintf(&dynamic_args[dyn_pos], "-meta:genre=%s", genre) > 0)
- {
- args[pos++] = dynamic_args[dyn_pos++];
- }
- if (asprintf(&dynamic_args[dyn_pos], "-meta:track=%d", tracknum) > 0)
- {
- args[pos++] = dynamic_args[dyn_pos++];
- }
-
- args[pos++] = NULL;
-
- fd = exec_with_output(args, STDERR_FILENO, &aac_pid, NULL);
-
- do
- {
- /* The Nero tag writer doesn't take very long to run. Just slurp the output. */
- size = read(fd, &buf[0], 256);
-
- if (size == -1 && errno == EINTR)
- /* signal interrupted read(), try again */
- size = 1;
- } while (size > 0);
-
- close(fd);
- /* don't go on until the signal for the previous call is handled */
- while (aac_pid != 0)
- {
- debugLog("w12\n");
- usleep(100000);
- }
-
- while(dyn_pos)
- {
- free(dynamic_args[--dyn_pos]);
- }
- *progress = 1;
-}
diff -ruN asunder-2.9.2-orig/src/wrappers.h src/wrappers.h
--- asunder-2.9.2-orig/src/wrappers.h 2017-11-18 18:58:43.000000000 -0600
+++ src/wrappers.h 2019-12-11 03:47:37.856520071 -0600
@@ -9,7 +9,6 @@
extern pid_t wavpack_pid; extern pid_t wavpack_pid;
extern pid_t monkey_pid; extern pid_t monkey_pid;
extern pid_t musepack_pid; extern pid_t musepack_pid;
@ -594,7 +645,7 @@ diff -ruN ../asunder-2.0-orig/src/wrappers.h src/wrappers.h
extern int numCdparanoiaFailed; extern int numCdparanoiaFailed;
extern int numLameFailed; extern int numLameFailed;
@@ -17,7 +16,6 @@ @@ -19,7 +18,6 @@
extern int numWavpackFailed; extern int numWavpackFailed;
extern int numMonkeyFailed; extern int numMonkeyFailed;
extern int numMusepackFailed; extern int numMusepackFailed;
@ -602,7 +653,7 @@ diff -ruN ../asunder-2.0-orig/src/wrappers.h src/wrappers.h
extern int numCdparanoiaOk; extern int numCdparanoiaOk;
extern int numLameOk; extern int numLameOk;
@@ -26,7 +24,6 @@ @@ -29,7 +27,6 @@
extern int numWavpackOk; extern int numWavpackOk;
extern int numMonkeyOk; extern int numMonkeyOk;
extern int numMusepackOk; extern int numMusepackOk;
@ -610,11 +661,17 @@ diff -ruN ../asunder-2.0-orig/src/wrappers.h src/wrappers.h
// signal handler to find out when out child has exited // signal handler to find out when out child has exited
void sigchld(int signum); void sigchld(int signum);
@@ -130,7 +127,3 @@ @@ -196,13 +193,3 @@
int quality, int quality,
double* progress); double* progress);
-void aac(char* wavfilename, -void aac(int tracknum,
- char* aacfilename, - const char * artist,
- const char * album,
- const char * title,
- const char * genre,
- const char * year,
- const char* wavfilename,
- const char* aacfilename,
- int quality, - int quality,
- double* progress); - double* progress);

389
helpers/DATA/asunder/asunder.4061-monkey.patch → helpers/DATA/asunder/asunder.4062-monkey.patch
View file

@ -1,7 +1,7 @@
diff -ruN src-monkey/callbacks.c src/callbacks.c diff -ruN asunder-2.9.2-acc/src/callbacks.c src/callbacks.c
--- src-monkey/callbacks.c 2011-11-08 19:18:12.000000000 +0000 --- asunder-2.9.2-acc/src/callbacks.c 2019-12-11 03:47:37.748518768 -0600
+++ src/callbacks.c 2011-11-08 19:29:08.000000000 +0000 +++ src/callbacks.c 2019-12-11 11:37:59.433406734 -0600
@@ -485,31 +485,6 @@ @@ -694,31 +694,6 @@
} }
void void
@ -33,10 +33,10 @@ diff -ruN src-monkey/callbacks.c src/callbacks.c
on_rip_musepack_toggled (GtkToggleButton *togglebutton, on_rip_musepack_toggled (GtkToggleButton *togglebutton,
gpointer user_data) gpointer user_data)
{ {
diff -ruN src-monkey/callbacks.h src/callbacks.h diff -ruN asunder-2.9.2-acc/src/callbacks.h src/callbacks.h
--- src-monkey/callbacks.h 2011-11-08 19:18:12.000000000 +0000 --- asunder-2.9.2-acc/src/callbacks.h 2019-12-11 03:47:37.776519106 -0600
+++ src/callbacks.h 2011-11-08 19:29:26.000000000 +0000 +++ src/callbacks.h 2019-12-11 11:37:59.433406734 -0600
@@ -161,9 +161,6 @@ @@ -157,9 +157,6 @@
on_rip_wavpack_toggled (GtkToggleButton *togglebutton, on_rip_wavpack_toggled (GtkToggleButton *togglebutton,
gpointer user_data); gpointer user_data);
void void
@ -46,10 +46,10 @@ diff -ruN src-monkey/callbacks.h src/callbacks.h
on_rip_musepack_toggled (GtkToggleButton *togglebutton, on_rip_musepack_toggled (GtkToggleButton *togglebutton,
gpointer user_data); gpointer user_data);
void void
diff -ruN src-monkey/interface.c src/interface.c diff -ruN asunder-2.9.2-acc/src/interface.c src/interface.c
--- src-monkey/interface.c 2011-11-08 19:18:12.000000000 +0000 --- asunder-2.9.2-acc/src/interface.c 2019-12-11 03:47:37.784519202 -0600
+++ src/interface.c 2011-11-08 19:30:02.000000000 +0000 +++ src/interface.c 2019-12-11 11:37:59.441406834 -0600
@@ -816,53 +816,6 @@ @@ -895,54 +895,6 @@
GLADE_HOOKUP_OBJECT (prefs, rip_musepack, "rip_musepack"); GLADE_HOOKUP_OBJECT (prefs, rip_musepack, "rip_musepack");
/* END MUSEPACK */ /* END MUSEPACK */
@ -60,6 +60,7 @@ diff -ruN src-monkey/interface.c src/interface.c
- GtkWidget* monkeyVbox; - GtkWidget* monkeyVbox;
- -
- frame8 = gtk_frame_new (NULL); - frame8 = gtk_frame_new (NULL);
- gtk_frame_set_shadow_type(GTK_FRAME(frame8), GTK_SHADOW_IN);
- gtk_widget_show (frame8); - gtk_widget_show (frame8);
- gtk_box_pack_start (GTK_BOX (hiddenbox), frame8, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (hiddenbox), frame8, FALSE, FALSE, 0);
- -
@ -100,10 +101,10 @@ diff -ruN src-monkey/interface.c src/interface.c
- GLADE_HOOKUP_OBJECT (prefs, rip_monkey, "rip_monkey"); - GLADE_HOOKUP_OBJECT (prefs, rip_monkey, "rip_monkey");
- /* END MONKEY */ - /* END MONKEY */
- -
label = gtk_label_new (_("Encode")); label = gtk_label_new (_("Encode"));
gtk_widget_show (label); gtk_widget_show (label);
gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 2), label); @@ -1333,18 +1285,6 @@
@@ -1230,18 +1183,6 @@
} }
} }
@ -122,31 +123,31 @@ diff -ruN src-monkey/interface.c src/interface.c
void disable_musepack_widgets(void) void disable_musepack_widgets(void)
{ {
gtk_widget_set_sensitive(lookup_widget(win_prefs, "musepack_bitrate_lbl"), FALSE); gtk_widget_set_sensitive(lookup_widget(win_prefs, "musepack_bitrate_lbl"), FALSE);
@@ -1478,7 +1419,7 @@ @@ -1722,7 +1662,7 @@
static const char* static const char*
GBLcomments = GBLcomments =
N_("An application to save tracks from an Audio CD \n" N_("An application to save tracks from an Audio CD \n"
-"as WAV, MP3, OGG, FLAC, Wavpack, Musepack, Monkey's Audio files "); -"as WAV, MP3, OGG, FLAC, Wavpack, Musepack, Monkey's Audio files ");
+"as WAV, MP3, OGG, FLAC, Wavpack, and Musepack audio files "); +"as WAV, MP3, OGG, FLAC, Wavpack and Musepack audio files ");
static const char* static const char*
GBLcopyright = GBLcopyright =
diff -ruN src-monkey/interface.h src/interface.h diff -ruN asunder-2.9.2-acc/src/interface.h src/interface.h
--- src-monkey/interface.h 2011-11-08 19:18:12.000000000 +0000 --- asunder-2.9.2-acc/src/interface.h 2019-12-11 03:47:37.788519251 -0600
+++ src/interface.h 2011-11-08 19:30:17.000000000 +0000 +++ src/interface.h 2019-12-11 11:37:59.441406834 -0600
@@ -13,8 +13,6 @@ @@ -15,8 +15,6 @@
void enable_ogg_widgets(void); void enable_opus_widgets(void);
void disable_wavpack_widgets(void); void disable_wavpack_widgets(void);
void enable_wavpack_widgets(void); void enable_wavpack_widgets(void);
-void disable_monkey_widgets(void); -void disable_monkey_widgets(void);
-void enable_monkey_widgets(void); -void enable_monkey_widgets(void);
void disable_musepack_widgets(void); void disable_musepack_widgets(void);
void enable_musepack_widgets(void); void enable_musepack_widgets(void);
#if GTK_MINOR_VERSION >= 6 void show_aboutbox (void);
diff -ruN src-monkey/prefs.c src/prefs.c diff -ruN asunder-2.9.2-acc/src/prefs.c src/prefs.c
--- src-monkey/prefs.c 2011-11-08 19:18:12.000000000 +0000 --- asunder-2.9.2-acc/src/prefs.c 2019-12-11 03:47:37.788519251 -0600
+++ src/prefs.c 2011-11-08 19:31:23.000000000 +0000 +++ src/prefs.c 2019-12-11 11:37:59.441406834 -0600
@@ -120,8 +120,6 @@ @@ -125,8 +125,6 @@
p->wavpack_compression = 1; p->wavpack_compression = 1;
p->wavpack_hybrid = 1; p->wavpack_hybrid = 1;
p->wavpack_bitrate = 3; p->wavpack_bitrate = 3;
@ -154,8 +155,8 @@ diff -ruN src-monkey/prefs.c src/prefs.c
- p->monkey_compression = 2; - p->monkey_compression = 2;
p->rip_musepack = 0; p->rip_musepack = 0;
p->musepack_bitrate = 2; p->musepack_bitrate = 2;
p->rip_opus = 0;
@@ -180,8 +178,6 @@ @@ -189,8 +187,6 @@
gtk_range_set_value(GTK_RANGE(lookup_widget(win_prefs, "wavpack_compression")), p->wavpack_compression); gtk_range_set_value(GTK_RANGE(lookup_widget(win_prefs, "wavpack_compression")), p->wavpack_compression);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "wavpack_hybrid")), p->wavpack_hybrid); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "wavpack_hybrid")), p->wavpack_hybrid);
gtk_range_set_value(GTK_RANGE(lookup_widget(win_prefs, "wavpack_bitrate_slider")), p->wavpack_bitrate); gtk_range_set_value(GTK_RANGE(lookup_widget(win_prefs, "wavpack_bitrate_slider")), p->wavpack_bitrate);
@ -163,8 +164,8 @@ diff -ruN src-monkey/prefs.c src/prefs.c
- gtk_range_set_value(GTK_RANGE(lookup_widget(win_prefs, "monkey_compression_slider")), p->monkey_compression); - gtk_range_set_value(GTK_RANGE(lookup_widget(win_prefs, "monkey_compression_slider")), p->monkey_compression);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_musepack")), p->rip_musepack); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_musepack")), p->rip_musepack);
gtk_range_set_value(GTK_RANGE(lookup_widget(win_prefs, "musepack_bitrate_slider")), p->musepack_bitrate); gtk_range_set_value(GTK_RANGE(lookup_widget(win_prefs, "musepack_bitrate_slider")), p->musepack_bitrate);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "eject_on_done")), p->eject_on_done); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_opus")), p->rip_opus);
@@ -210,8 +206,6 @@ @@ -221,8 +217,6 @@
disable_wavpack_widgets(); disable_wavpack_widgets();
else else
enable_wavpack_widgets(); /* need this to potentially disable hybrid widgets */ enable_wavpack_widgets(); /* need this to potentially disable hybrid widgets */
@ -172,8 +173,8 @@ diff -ruN src-monkey/prefs.c src/prefs.c
- disable_monkey_widgets(); - disable_monkey_widgets();
if( !(p->rip_musepack) ) if( !(p->rip_musepack) )
disable_musepack_widgets(); disable_musepack_widgets();
} if (!(p->rip_opus))
@@ -267,8 +261,6 @@ @@ -281,8 +275,6 @@
p->wavpack_compression = (int)gtk_range_get_value(GTK_RANGE(lookup_widget(win_prefs, "wavpack_compression"))); p->wavpack_compression = (int)gtk_range_get_value(GTK_RANGE(lookup_widget(win_prefs, "wavpack_compression")));
p->wavpack_hybrid = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "wavpack_hybrid"))); p->wavpack_hybrid = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "wavpack_hybrid")));
p->wavpack_bitrate = (int)gtk_range_get_value(GTK_RANGE(lookup_widget(win_prefs, "wavpack_bitrate_slider"))); p->wavpack_bitrate = (int)gtk_range_get_value(GTK_RANGE(lookup_widget(win_prefs, "wavpack_bitrate_slider")));
@ -181,8 +182,8 @@ diff -ruN src-monkey/prefs.c src/prefs.c
- p->monkey_compression = (int)gtk_range_get_value(GTK_RANGE(lookup_widget(win_prefs, "monkey_compression_slider"))); - p->monkey_compression = (int)gtk_range_get_value(GTK_RANGE(lookup_widget(win_prefs, "monkey_compression_slider")));
p->rip_musepack = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_musepack"))); p->rip_musepack = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_musepack")));
p->musepack_bitrate = (int)gtk_range_get_value(GTK_RANGE(lookup_widget(win_prefs, "musepack_bitrate_slider"))); p->musepack_bitrate = (int)gtk_range_get_value(GTK_RANGE(lookup_widget(win_prefs, "musepack_bitrate_slider")));
p->rip_opus = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_opus")));
@@ -348,8 +340,6 @@ @@ -429,8 +421,6 @@
fprintf(config, "%d\n", p->do_log); fprintf(config, "%d\n", p->do_log);
fprintf(config, "%s\n", p->cddb_server_name); fprintf(config, "%s\n", p->cddb_server_name);
fprintf(config, "%d\n", p->cddb_port_number); fprintf(config, "%d\n", p->cddb_port_number);
@ -191,7 +192,7 @@ diff -ruN src-monkey/prefs.c src/prefs.c
fprintf(config, "%d\n", p->rip_musepack); fprintf(config, "%d\n", p->rip_musepack);
fprintf(config, "%d\n", p->musepack_bitrate); fprintf(config, "%d\n", p->musepack_bitrate);
fprintf(config, "%d\n", p->more_formats_expanded); fprintf(config, "%d\n", p->more_formats_expanded);
@@ -521,12 +511,6 @@ @@ -598,12 +588,6 @@
} }
// this one can be 0 // this one can be 0
@ -204,9 +205,9 @@ diff -ruN src-monkey/prefs.c src/prefs.c
p->rip_musepack = read_line_num(fd); p->rip_musepack = read_line_num(fd);
// this one can be 0 // this one can be 0
diff -ruN src-monkey/prefs.h src/prefs.h diff -ruN asunder-2.9.2-acc/src/prefs.h src/prefs.h
--- src-monkey/prefs.h 2011-11-08 19:18:12.000000000 +0000 --- asunder-2.9.2-acc/src/prefs.h 2019-12-11 03:47:37.788519251 -0600
+++ src/prefs.h 2011-11-08 19:31:47.000000000 +0000 +++ src/prefs.h 2019-12-11 11:37:59.441406834 -0600
@@ -32,8 +32,6 @@ @@ -32,8 +32,6 @@
int do_log; int do_log;
char* cddb_server_name; char* cddb_server_name;
@ -216,70 +217,70 @@ diff -ruN src-monkey/prefs.h src/prefs.h
int rip_musepack; int rip_musepack;
int musepack_bitrate; int musepack_bitrate;
int more_formats_expanded; int more_formats_expanded;
diff -ruN src-monkey/threads.c src/threads.c diff -ruN asunder-2.9.2-acc/src/threads.c src/threads.c
--- src-monkey/threads.c 2011-11-08 19:18:12.000000000 +0000 --- asunder-2.9.2-acc/src/threads.c 2019-12-11 10:11:03.183303965 -0600
+++ src/threads.c 2011-11-08 19:28:27.000000000 +0000 +++ src/threads.c 2019-12-11 11:37:59.441406834 -0600
@@ -37,7 +37,6 @@ @@ -39,7 +39,6 @@
static FILE * playlist_ogg = NULL; static FILE * playlist_opus = NULL;
static FILE * playlist_flac = NULL; static FILE * playlist_flac = NULL;
static FILE * playlist_wavpack = NULL; static FILE * playlist_wavpack = NULL;
-static FILE * playlist_monkey = NULL; -static FILE * playlist_monkey = NULL;
static FILE * playlist_musepack = NULL; static FILE * playlist_musepack = NULL;
/* ripping or encoding, so that can know not to clear the tracklist on eject */ /* ripping or encoding, so that can know not to clear the tracklist on eject */
@@ -57,7 +56,6 @@ @@ -60,7 +59,6 @@
static double ogg_percent; static double opus_percent;
static double flac_percent; static double flac_percent;
static double wavpack_percent; static double wavpack_percent;
-static double monkey_percent; -static double monkey_percent;
static double musepack_percent; static double musepack_percent;
static int rip_tracks_completed; static int rip_tracks_completed;
static int encode_tracks_completed; static int encode_tracks_completed;
@@ -80,14 +78,12 @@ @@ -86,14 +84,12 @@
kill(flac_pid, SIGKILL); kill(pid, SIGKILL);
if (wavpack_pid != 0) if ((pid = wavpack_pid) != 0)
kill(wavpack_pid, SIGKILL); kill(pid, SIGKILL);
- if (monkey_pid != 0) - if ((pid = monkey_pid) != 0)
- kill(monkey_pid, SIGKILL); - kill(pid, SIGKILL);
if (musepack_pid != 0) if ((pid = musepack_pid) != 0)
kill(musepack_pid, SIGKILL); kill(pid, SIGKILL);
/* wait until all the worker threads are done */ /* wait until all the worker threads are done */
while (cdparanoia_pid != 0 || lame_pid != 0 || oggenc_pid != 0 || while (cdparanoia_pid != 0 || lame_pid != 0 || oggenc_pid != 0 ||
- flac_pid != 0 || wavpack_pid != 0 || monkey_pid != 0 || - opusenc_pid != 0 || flac_pid != 0 || wavpack_pid != 0 || monkey_pid != 0 ||
+ flac_pid != 0 || wavpack_pid != 0 || + opusenc_pid != 0 || flac_pid != 0 || wavpack_pid != 0 ||
musepack_pid != 0) musepack_pid != 0)
{ {
debugLog("w1"); debugLog("w1");
@@ -110,8 +106,8 @@ @@ -116,8 +112,8 @@
gdk_flush(); gdk_flush();
working = false; working = false;
- show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numFlacOk + numWavpackOk + numMonkeyOk + numMusepackOk , - show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numOpusOk + numFlacOk + numWavpackOk + numMonkeyOk + numMusepackOk,
- numCdparanoiaFailed + numLameFailed + numOggFailed + numFlacFailed + numWavpackFailed + numMonkeyFailed + numMusepackFailed ); - numCdparanoiaFailed + numLameFailed + numOggFailed + numOpusFailed + numFlacFailed + numWavpackFailed + numMonkeyFailed + numMusepackFailed);
+ show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numFlacOk + numWavpackOk + numMusepackOk , + show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numOpusOk + numFlacOk + numWavpackOk + numMusepackOk,
+ numCdparanoiaFailed + numLameFailed + numOggFailed + numFlacFailed + numWavpackFailed + numMusepackFailed ); + numCdparanoiaFailed + numLameFailed + numOggFailed + numOpusFailed + numFlacFailed + numWavpackFailed + numMusepackFailed);
} }
// spawn needed threads and begin ripping // spawn needed threads and begin ripping
@@ -128,7 +124,6 @@ @@ -140,7 +136,6 @@
ogg_percent = 0.0; opus_percent = 0.0;
flac_percent = 0.0; flac_percent = 0.0;
wavpack_percent = 0.0; wavpack_percent = 0.0;
- monkey_percent = 0.0; - monkey_percent = 0.0;
musepack_percent = 0.0; musepack_percent = 0.0;
rip_tracks_completed = 0; rip_tracks_completed = 0;
encode_tracks_completed = 0; encode_tracks_completed = 0;
@@ -155,7 +150,7 @@ @@ -172,7 +167,7 @@
// make sure there's at least one format to rip to // make sure there's at least one format to rip to
if (!global_prefs->rip_wav && !global_prefs->rip_mp3 && !global_prefs->rip_ogg && if (!global_prefs->rip_wav && !global_prefs->rip_mp3 && !global_prefs->rip_ogg && !global_prefs->rip_opus &&
- !global_prefs->rip_flac && !global_prefs->rip_wavpack && !global_prefs->rip_monkey && - !global_prefs->rip_flac && !global_prefs->rip_wavpack && !global_prefs->rip_monkey &&
+ !global_prefs->rip_flac && !global_prefs->rip_wavpack && + !global_prefs->rip_flac && !global_prefs->rip_wavpack &&
!global_prefs->rip_musepack) !global_prefs->rip_musepack)
{ {
GtkWidget * dialog; GtkWidget * dialog;
@@ -270,19 +265,11 @@ @@ -306,14 +301,6 @@
free(filename); free(filename);
} }
@ -294,53 +295,65 @@ diff -ruN src-monkey/threads.c src/threads.c
if (global_prefs->rip_musepack) if (global_prefs->rip_musepack)
{ {
char * filename = make_filename(prefs_get_music_dir(global_prefs), albumdir, playlist, "mpc.m3u"); char * filename = make_filename(prefs_get_music_dir(global_prefs), albumdir, playlist, "mpc.m3u");
@@ -338,7 +325,6 @@
- make_playlist(filename, &playlist_monkey); numOpusFailed = 0;
+ make_playlist(filename, &playlist_musepack);
free(filename);
}
@@ -298,7 +285,6 @@
numOggFailed = 0;
numFlacFailed = 0; numFlacFailed = 0;
numWavpackFailed = 0; numWavpackFailed = 0;
- numMonkeyFailed = 0; - numMonkeyFailed = 0;
numMusepackFailed = 0; numMusepackFailed = 0;
numCdparanoiaOk = 0; numCdparanoiaOk = 0;
@@ -306,7 +292,6 @@ @@ -347,7 +333,6 @@
numOggOk = 0; numOpusOk = 0;
numFlacOk = 0; numFlacOk = 0;
numWavpackOk = 0; numWavpackOk = 0;
- numMonkeyOk = 0; - numMonkeyOk = 0;
numMusepackOk = 0; numMusepackOk = 0;
ripper = g_thread_create(rip, NULL, TRUE, NULL); ripper = g_thread_create(rip, NULL, TRUE, NULL);
@@ -444,7 +429,6 @@ @@ -524,9 +509,6 @@
char* flacfilename = NULL; if (playlist_wavpack)
char* wavpackfilename = NULL; fclose(playlist_wavpack);
char* wavpackfilename2 = NULL; playlist_wavpack = NULL;
- char* monkeyfilename = NULL; - if (playlist_monkey)
char* musepackfilename = NULL; - fclose(playlist_monkey);
struct stat statStruct; - playlist_monkey = NULL;
bool doEncode; if (playlist_musepack)
@@ -523,7 +507,6 @@ fclose(playlist_musepack);
flacfilename = make_filename(prefs_get_music_dir(global_prefs), albumdir, musicfilename, "flac"); playlist_musepack = NULL;
wavpackfilename = make_filename(prefs_get_music_dir(global_prefs), albumdir, musicfilename, "wv"); @@ -953,64 +935,6 @@
wavpackfilename2 = make_filename(prefs_get_music_dir(global_prefs), albumdir, musicfilename, "wvc"); free(wavpackfilename);
- monkeyfilename = make_filename(prefs_get_music_dir(global_prefs), albumdir, musicfilename, "ape"); free(wavpackfilename2);
musepackfilename = make_filename(prefs_get_music_dir(global_prefs), albumdir, musicfilename, "mpc");
if (global_prefs->rip_mp3)
@@ -658,41 +641,6 @@
fflush(playlist_wavpack);
}
} }
- if (global_prefs->rip_monkey) - if (global_prefs->rip_monkey)
- { - {
- debugLog("Encoding track %d to \"%s\"\n", tracknum, monkeyfilename); - if (aborted)
- {
- free(albumdir);
- free(musicfilename);
- free(wavfilename);
- free(trackartist_trimmed);
- free(tracktitle_trimmed);
- -
- if (aborted) g_thread_exit(NULL); - free(trackartist);
- free(tracktitle);
- free(tracktime);
-
- free(album_artist);
- free(album_title);
- free(album_genre);
- free(album_year);
- free(album_artist_trimmed);
- free(album_title_trimmed);
- free(album_genre_trimmed);
-
- close_playlists();
- return NULL;
- }
-
- char * monkeyfilename = make_filename(prefs_get_music_dir(global_prefs), albumdir, musicfilename, "ape");
- snprintf(logStr, 1024, "Encoding track %d to \"%s\"\n", tracknum, monkeyfilename);
- debugLog(logStr);
- -
- rc = stat(monkeyfilename, &statStruct); - rc = stat(monkeyfilename, &statStruct);
- if(rc == 0) - if(rc == 0)
@ -362,63 +375,46 @@ diff -ruN src-monkey/threads.c src/threads.c
- &monkey_percent); - &monkey_percent);
- } - }
- -
- if (aborted) g_thread_exit(NULL);
-
- if (playlist_monkey) - if (playlist_monkey)
- { - {
- fprintf(playlist_monkey, "#EXTINF:%d,%s - %s\n", (min*60)+sec, trackartist, tracktitle); - fprintf(playlist_monkey, "#EXTINF:%d,%s - %s\n", (min*60)+sec, trackartist, tracktitle);
- fprintf(playlist_monkey, "%s\n", basename(monkeyfilename)); - fprintf(playlist_monkey, "%s\n", basename(monkeyfilename));
- fflush(playlist_monkey); - fflush(playlist_monkey);
- } - }
- free(monkeyfilename);
- } - }
if (global_prefs->rip_musepack) if (global_prefs->rip_musepack)
{ {
debugLog("Encoding track %d to \"%s\"\n", tracknum, musepackfilename); if (aborted)
@@ -752,14 +700,12 @@ @@ -1100,7 +1024,6 @@
free(oggfilename); opus_percent = 0.0;
free(flacfilename);
free(wavpackfilename);
- free(monkeyfilename);
free(musepackfilename);
mp3_percent = 0.0;
ogg_percent = 0.0;
flac_percent = 0.0; flac_percent = 0.0;
wavpack_percent = 0.0; wavpack_percent = 0.0;
- monkey_percent = 0.0; - monkey_percent = 0.0;
musepack_percent = 0.0; musepack_percent = 0.0;
encode_tracks_completed++; encode_tracks_completed++;
} }
@@ -785,8 +731,6 @@ @@ -1145,7 +1068,7 @@
playlist_flac = NULL;
if (playlist_wavpack) fclose(playlist_wavpack);
playlist_wavpack = NULL;
- if (playlist_monkey) fclose(playlist_monkey);
- playlist_monkey = NULL;
if (playlist_musepack) fclose(playlist_musepack);
playlist_musepack = NULL;
@@ -797,7 +741,7 @@
/* wait until all the worker threads are done */ /* wait until all the worker threads are done */
while (cdparanoia_pid != 0 || lame_pid != 0 || oggenc_pid != 0 || while (cdparanoia_pid != 0 || lame_pid != 0 || oggenc_pid != 0 ||
- flac_pid != 0 || wavpack_pid != 0 || monkey_pid != 0 || - opusenc_pid != 0 || flac_pid != 0 || wavpack_pid != 0 || monkey_pid != 0 ||
+ flac_pid != 0 || wavpack_pid != 0 || + opusenc_pid != 0 || flac_pid != 0 || wavpack_pid != 0 ||
musepack_pid != 0) musepack_pid != 0)
{ {
debugLog("w2"); debugLog("w2");
@@ -811,8 +755,8 @@ @@ -1165,8 +1088,8 @@
gtk_widget_hide(win_ripping); eject_disc(global_prefs->cdrom);
gdk_flush(); }
- show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numFlacOk + numWavpackOk + numMonkeyOk + numMusepackOk , - show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numOpusOk + numFlacOk + numWavpackOk + numMonkeyOk + numMusepackOk,
- numCdparanoiaFailed + numLameFailed + numOggFailed + numFlacFailed + numWavpackFailed + numMonkeyFailed + numMusepackFailed ); - numCdparanoiaFailed + numLameFailed + numOggFailed + numOpusFailed + numFlacFailed + numWavpackFailed + numMonkeyFailed + numMusepackFailed );
+ show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numFlacOk + numWavpackOk + numMusepackOk , + show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numOpusOk + numFlacOk + numWavpackOk + numMusepackOk,
+ numCdparanoiaFailed + numLameFailed + numOggFailed + numFlacFailed + numWavpackFailed + numMusepackFailed ); + numCdparanoiaFailed + numLameFailed + numOggFailed + numOpusFailed + numFlacFailed + numWavpackFailed + numMusepackFailed );
gdk_threads_leave(); gdk_threads_leave();
return NULL; return NULL;
@@ -830,8 +774,6 @@ @@ -1187,8 +1110,6 @@
parts++; parts++;
if(global_prefs->rip_wavpack) if(global_prefs->rip_wavpack)
parts++; parts++;
@ -427,82 +423,58 @@ diff -ruN src-monkey/threads.c src/threads.c
if(global_prefs->rip_musepack) if(global_prefs->rip_musepack)
parts++; parts++;
@@ -868,10 +810,10 @@ @@ -1233,8 +1154,8 @@
debugLog("completed tracks %d, rip %.2lf%%; encoded tracks %d, "
"mp3 %.2lf%% ogg %.2lf%% flac %.2lf%% wavpack %.2lf%% "
- "monkey %.2lf%% musepack %.2lf%% \n\n",
+ "musepack %.2lf%% \n\n",
rip_tracks_completed, rip_percent*100, encode_tracks_completed,
mp3_percent*100, ogg_percent*100, flac_percent*100, wavpack_percent*100,
- monkey_percent*100,musepack_percent*100);
+ musepack_percent*100);
prip = (rip_tracks_completed+rip_percent) / tracks_to_rip;
snprintf(srip, 13, "%d%% (%d/%d)", (int)(prip*100),
@@ -882,7 +824,7 @@
if (parts > 1) if (parts > 1)
{ {
pencode = ((double)encode_tracks_completed/(double)tracks_to_rip) + pencode = ((double)encode_tracks_completed/(double)tracks_to_rip) +
- ((mp3_percent+ogg_percent+flac_percent+wavpack_percent+monkey_percent - ((mp3_percent+ogg_percent+flac_percent+wavpack_percent+monkey_percent
- +opus_percent+musepack_percent) /
+ ((mp3_percent+ogg_percent+flac_percent+wavpack_percent + ((mp3_percent+ogg_percent+flac_percent+wavpack_percent
+musepack_percent) / + +opus_percent+musepack_percent+aac_percent) /
(parts-1) / tracks_to_rip); (parts-1) / tracks_to_rip);
snprintf(sencode, 13, "%d%% (%d/%d)", (int)(pencode*100), snprintf(sencode, 13, "%d%% (%d/%d)", (int)(pencode*100),
diff -ruN src-monkey/wrappers.c src/wrappers.c (encode_tracks_completed < tracks_to_rip)
--- src-monkey/wrappers.c 2011-11-08 19:18:12.000000000 +0000 @@ -1270,10 +1191,10 @@
+++ src/wrappers.c 2011-11-08 19:21:50.000000000 +0000 if ((looper % 20) == 0) {
@@ -32,7 +32,6 @@ snprintf(logStr, 1024, "completed tracks %d, rip %.2lf%%; encoded tracks %d, "
pid_t oggenc_pid; "mp3 %.2lf%% ogg %.2lf%% opus %.2lf%% flac %.2lf%% wavpack %.2lf%% "
- "monkey %.2lf%% musepack %.2lf%% prip %.2lf%% pencode %.2lf%%\n",
+ "musepack %.2lf%% prip %.2lf%% pencode %.2lf%%\n",
rip_tracks_completed, rip_percent*100, encode_tracks_completed,
mp3_percent*100, ogg_percent*100, opus_percent*100, flac_percent*100, wavpack_percent*100,
- monkey_percent*100,musepack_percent*100,
+ musepack_percent*100,
prip*100, pencode*100);
debugLog(logStr);
}
diff -ruN asunder-2.9.2-acc/src/wrappers.c src/wrappers.c
--- asunder-2.9.2-acc/src/wrappers.c 2019-12-11 11:11:22.457016117 -0600
+++ src/wrappers.c 2019-12-11 11:37:59.441406834 -0600
@@ -35,7 +35,6 @@
pid_t opusenc_pid;
pid_t flac_pid; pid_t flac_pid;
pid_t wavpack_pid; pid_t wavpack_pid;
-pid_t monkey_pid; -pid_t monkey_pid;
pid_t musepack_pid; pid_t musepack_pid;
int numCdparanoiaFailed; int numCdparanoiaFailed;
@@ -40,7 +39,6 @@ @@ -44,7 +43,6 @@
int numOggFailed; int numOpusFailed;
int numFlacFailed; int numFlacFailed;
int numWavpackFailed; int numWavpackFailed;
-int numMonkeyFailed; -int numMonkeyFailed;
int numMusepackFailed; int numMusepackFailed;
int numCdparanoiaOk; int numCdparanoiaOk;
@@ -48,7 +46,6 @@ @@ -90,7 +88,6 @@
int numOggOk; extern pid_t opusenc_pid;
int numFlacOk;
int numWavpackOk;
-int numMonkeyOk;
int numMusepackOk;
int numchildren = 0;
@@ -84,7 +81,6 @@
extern pid_t oggenc_pid;
extern pid_t flac_pid; extern pid_t flac_pid;
extern pid_t wavpack_pid; extern pid_t wavpack_pid;
-extern pid_t monkey_pid; -extern pid_t monkey_pid;
extern pid_t musepack_pid; extern pid_t musepack_pid;
// signal handler to find out when our child has exited // Signal handler to find out when our child has exited.
@@ -98,7 +94,7 @@ @@ -140,11 +137,6 @@
debugLog("sigchld for %d (know about wav %d, mp3 %d, ogg %d, flac %d, "
"wv %d, ape %d, mpc %d\n",
pid, cdparanoia_pid, lame_pid, oggenc_pid, flac_pid,
- wavpack_pid, monkey_pid, musepack_pid);
+ wavpack_pid, musepack_pid);
/* this is because i can't seem to be able to block sigchld: */
while(waitBeforeSigchld)
@@ -108,7 +104,7 @@
}
if (pid != cdparanoia_pid && pid != lame_pid && pid != oggenc_pid &&
- pid != flac_pid && pid != wavpack_pid && pid != monkey_pid &&
+ pid != flac_pid && pid != wavpack_pid &&
pid != musepack_pid )
{
printf("SIGCHLD for unknown pid, report bug please");
@@ -152,11 +148,6 @@
wavpack_pid = 0; wavpack_pid = 0;
numWavpackFailed++; numWavpackFailed++;
} }
@ -514,7 +486,7 @@ diff -ruN src-monkey/wrappers.c src/wrappers.c
else if (pid == musepack_pid) else if (pid == musepack_pid)
{ {
musepack_pid = 0; musepack_pid = 0;
@@ -191,11 +182,6 @@ @@ -184,11 +176,6 @@
wavpack_pid = 0; wavpack_pid = 0;
numWavpackOk++; numWavpackOk++;
} }
@ -526,13 +498,12 @@ diff -ruN src-monkey/wrappers.c src/wrappers.c
else if (pid == musepack_pid) else if (pid == musepack_pid)
{ {
musepack_pid = 0; musepack_pid = 0;
@@ -848,64 +834,6 @@ @@ -1156,65 +1143,6 @@
usleep(100000); *progress = 1;
} }
}
- -void mac(const char* wavfilename,
-void mac(char* wavfilename, - const char* monkeyfilename,
- char* monkeyfilename,
- int compression, - int compression,
- double* progress) - double* progress)
-{ -{
@ -551,7 +522,7 @@ diff -ruN src-monkey/wrappers.c src/wrappers.c
- -
- args[pos++] = NULL; - args[pos++] = NULL;
- -
- fd = exec_with_output(args, STDERR_FILENO, &monkey_pid); - fd = exec_with_output(args, STDERR_FILENO, &monkey_pid, NULL);
- -
- int size; - int size;
- char buf[256]; - char buf[256];
@ -570,7 +541,7 @@ diff -ruN src-monkey/wrappers.c src/wrappers.c
- size = 1; - size = 1;
- } - }
- -
- } while ((buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0) && (pos < 256)); - } while ((buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0) && (pos < 255));
- buf[pos] = '\0'; - buf[pos] = '\0';
- -
- double percent; - double percent;
@ -584,49 +555,51 @@ diff -ruN src-monkey/wrappers.c src/wrappers.c
- /* don't go on until the signal for the previous call is handled */ - /* don't go on until the signal for the previous call is handled */
- while (monkey_pid != 0) - while (monkey_pid != 0)
- { - {
- debugLog("w9 (%d)\n", monkey_pid); - debugLog("w9\n");
- usleep(100000); - usleep(100000);
- } - }
- *progress = 1;
-} -}
-
void musepack(char* wavfilename, // uses mpcenc to encode a WAV file into a .mpc and tag it
char* musepackfilename, //
diff -ruN src-monkey/wrappers.h src/wrappers.h // tracknum - the track number
--- src-monkey/wrappers.h 2011-11-08 19:18:12.000000000 +0000 diff -ruN asunder-2.9.2-acc/src/wrappers.h src/wrappers.h
+++ src/wrappers.h 2011-11-08 19:32:52.000000000 +0000 --- asunder-2.9.2-acc/src/wrappers.h 2019-12-11 03:47:37.856520071 -0600
@@ -6,7 +6,6 @@ +++ src/wrappers.h 2019-12-11 11:37:59.441406834 -0600
extern pid_t oggenc_pid; @@ -7,7 +7,6 @@
extern pid_t opusenc_pid;
extern pid_t flac_pid; extern pid_t flac_pid;
extern pid_t wavpack_pid; extern pid_t wavpack_pid;
-extern pid_t monkey_pid; -extern pid_t monkey_pid;
extern pid_t musepack_pid; extern pid_t musepack_pid;
extern int numCdparanoiaFailed; extern int numCdparanoiaFailed;
@@ -14,7 +13,6 @@ @@ -16,7 +15,6 @@
extern int numOggFailed; extern int numOpusFailed;
extern int numFlacFailed; extern int numFlacFailed;
extern int numWavpackFailed; extern int numWavpackFailed;
-extern int numMonkeyFailed; -extern int numMonkeyFailed;
extern int numMusepackFailed; extern int numMusepackFailed;
extern int numCdparanoiaOk; extern int numCdparanoiaOk;
@@ -22,7 +20,6 @@ @@ -25,7 +23,6 @@
extern int numOggOk; extern int numOpusOk;
extern int numFlacOk; extern int numFlacOk;
extern int numWavpackOk; extern int numWavpackOk;
-extern int numMonkeyOk; -extern int numMonkeyOk;
extern int numMusepackOk; extern int numMusepackOk;
// signal handler to find out when out child has exited // signal handler to find out when out child has exited
@@ -117,11 +114,6 @@ @@ -167,11 +164,6 @@
int bitrate, int bitrate,
double * progress); double * progress);
-void mac(char* wavfilename, -void mac(const char* wavfilename,
- char* monkeyfilename, - const char* monkeyfilename,
- int compression, - int compression,
- double* progress); - double* progress);
- -
void musepack(char* wavfilename, // uses mpcenc to encode a WAV file into a .mpc and tag it
char* musepackfilename, //
int quality, // tracknum - the track number