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

677
helpers/DATA/asunder/asunder.4062-aac.patch Normal file
View file

@ -0,0 +1,677 @@
diff -ruN asunder-2.9.2-orig/src/callbacks.c src/callbacks.c
--- asunder-2.9.2-orig/src/callbacks.c 2017-11-18 17:47:03.000000000 -0600
+++ src/callbacks.c 2019-12-11 03:47:37.748518768 -0600
@@ -719,31 +719,6 @@
}
void
-on_rip_aac_toggled (GtkToggleButton *togglebutton,
- gpointer user_data)
-{
- if (gtk_toggle_button_get_active(togglebutton) && !program_exists("neroAacEnc"))
- {
- GtkWidget * dialog;
- dialog = gtk_message_dialog_new(GTK_WINDOW(win_main),
- GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
- _("%s was not found in your path. Asunder requires it to create %s files. "
- "All %s functionality is disabled."),
- "'neroAacEnc'", "MP4", "AAC");
- gtk_dialog_run(GTK_DIALOG(dialog));
- gtk_widget_destroy(dialog);
-
- global_prefs->rip_aac = 0;
- gtk_toggle_button_set_active(togglebutton, global_prefs->rip_aac);
- }
-
- if (!gtk_toggle_button_get_active(togglebutton))
- disable_aac_widgets();
- else
- enable_aac_widgets();
-}
-
-void
on_rip_musepack_toggled (GtkToggleButton *togglebutton,
gpointer user_data)
{
diff -ruN asunder-2.9.2-orig/src/callbacks.h src/callbacks.h
--- asunder-2.9.2-orig/src/callbacks.h 2017-11-18 16:13:26.000000000 -0600
+++ src/callbacks.h 2019-12-11 03:47:37.776519106 -0600
@@ -160,9 +160,6 @@
on_rip_monkey_toggled (GtkToggleButton *togglebutton,
gpointer user_data);
void
-on_rip_aac_toggled (GtkToggleButton *togglebutton,
- gpointer user_data);
-void
on_rip_musepack_toggled (GtkToggleButton *togglebutton,
gpointer user_data);
void
diff -ruN asunder-2.9.2-orig/src/interface.c src/interface.c
--- asunder-2.9.2-orig/src/interface.c 2017-11-19 15:36:39.000000000 -0600
+++ src/interface.c 2019-12-11 03:47:37.784519202 -0600
@@ -943,62 +943,7 @@
GLADE_HOOKUP_OBJECT (prefs, rip_monkey, "rip_monkey");
/* END MONKEY */
- expander = gtk_expander_new(_("Proprietary encoders"));
- gtk_widget_show (expander);
- gtk_box_pack_start (GTK_BOX (vbox), expander, FALSE, FALSE, 0);
- GLADE_HOOKUP_OBJECT (prefs, expander, "proprietary_formats_expander");
-
- hiddenbox = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (hiddenbox);
- gtk_container_add (GTK_CONTAINER (expander), hiddenbox);
-
- /* AAC */
- GtkWidget* rip_aac;
- GtkWidget* aacQuality;
- GtkWidget* aacVbox;
-
- frame8 = gtk_frame_new (NULL);
- gtk_frame_set_shadow_type(GTK_FRAME(frame8), GTK_SHADOW_IN);
- gtk_widget_show (frame8);
- gtk_box_pack_start (GTK_BOX (hiddenbox), frame8, FALSE, FALSE, 0);
-
- alignment11 = gtk_alignment_new (0.5, 0.5, 1, 1);
- gtk_widget_show (alignment11);
- gtk_container_add (GTK_CONTAINER (frame8), alignment11);
- gtk_alignment_set_padding (GTK_ALIGNMENT (alignment11), 2, 2, 12, 2);
-
- aacVbox = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (aacVbox);
- gtk_container_add (GTK_CONTAINER (alignment11), aacVbox);
-
- hbox13 = gtk_hbox_new (FALSE, 0);
- gtk_widget_show (hbox13);
- gtk_box_pack_start (GTK_BOX (aacVbox), hbox13, FALSE, FALSE, 0);
-
- label = gtk_label_new (_("Quality"));
- gtk_widget_show (label);
- gtk_box_pack_start (GTK_BOX (hbox13), label, FALSE, FALSE, 0);
- GLADE_HOOKUP_OBJECT (prefs, label, "aac_quality_lbl");
-
- aacQuality = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (0, 1, 100, 1, 1, 1)));
- gtk_widget_show (aacQuality);
- gtk_box_pack_start (GTK_BOX (hbox13), aacQuality, TRUE, TRUE, 5);
- gtk_scale_set_value_pos (GTK_SCALE (aacQuality), GTK_POS_RIGHT);
- gtk_scale_set_digits (GTK_SCALE (aacQuality), 0);
- GLADE_HOOKUP_OBJECT (prefs, aacQuality, "aac_quality_slider");
-
- tooltips = gtk_tooltips_new ();
- gtk_tooltips_set_tip (tooltips, aacQuality, _("Higher quality means bigger file. Default is 60."), NULL);
-
- rip_aac = gtk_check_button_new_with_mnemonic (_("AAC (lossy compression, Nero encoder)"));
- gtk_widget_show (rip_aac);
- gtk_frame_set_label_widget (GTK_FRAME (frame8), rip_aac);
- g_signal_connect ((gpointer) rip_aac, "toggled",
- G_CALLBACK (on_rip_aac_toggled),
- NULL);
- GLADE_HOOKUP_OBJECT (prefs, rip_aac, "rip_aac");
- /* END AAC */
-
+
label = gtk_label_new (_("Encode"));
gtk_widget_show (label);
gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 2), label);
@@ -1400,18 +1345,6 @@
gtk_widget_set_sensitive(lookup_widget(win_prefs, "monkey_compression_slider"), TRUE);
}
-void disable_aac_widgets(void)
-{
- gtk_widget_set_sensitive(lookup_widget(win_prefs, "aac_quality_lbl"), FALSE);
- gtk_widget_set_sensitive(lookup_widget(win_prefs, "aac_quality_slider"), FALSE);
-}
-
-void enable_aac_widgets(void)
-{
- gtk_widget_set_sensitive(lookup_widget(win_prefs, "aac_quality_lbl"), TRUE);
- gtk_widget_set_sensitive(lookup_widget(win_prefs, "aac_quality_slider"), TRUE);
-}
-
void disable_musepack_widgets(void)
{
gtk_widget_set_sensitive(lookup_widget(win_prefs, "musepack_bitrate_lbl"), FALSE);
@@ -1789,8 +1722,7 @@
static const char*
GBLcomments =
N_("An application to save tracks from an Audio CD \n"
-"as WAV, MP3, OGG, FLAC, Wavpack, Opus, Musepack, Monkey's Audio, and/or "
-"AAC files.");
+"as WAV, MP3, OGG, FLAC, Wavpack, Musepack, Monkey's Audio files ");
static const char*
GBLcopyright =
diff -ruN asunder-2.9.2-orig/src/interface.h src/interface.h
--- asunder-2.9.2-orig/src/interface.h 2017-11-18 16:13:26.000000000 -0600
+++ src/interface.h 2019-12-11 03:47:37.788519251 -0600
@@ -17,8 +17,6 @@
void enable_wavpack_widgets(void);
void disable_monkey_widgets(void);
void enable_monkey_widgets(void);
-void disable_aac_widgets(void);
-void enable_aac_widgets(void);
void disable_musepack_widgets(void);
void enable_musepack_widgets(void);
void show_aboutbox (void);
diff -ruN asunder-2.9.2-orig/src/prefs.c src/prefs.c
--- asunder-2.9.2-orig/src/prefs.c 2017-11-04 21:41:13.000000000 -0600
+++ src/prefs.c 2019-12-11 03:47:37.788519251 -0600
@@ -127,8 +127,6 @@
p->wavpack_bitrate = 3;
p->rip_monkey = 0;
p->monkey_compression = 2;
- p->rip_aac = 0;
- p->aac_quality = 60;
p->rip_musepack = 0;
p->musepack_bitrate = 2;
p->rip_opus = 0;
@@ -193,8 +191,6 @@
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_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_aac")), p->rip_aac);
- 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_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, "rip_opus")), p->rip_opus);
@@ -227,8 +223,6 @@
enable_wavpack_widgets(); /* need this to potentially disable hybrid widgets */
if( !(p->rip_monkey) )
disable_monkey_widgets();
- if( !(p->rip_aac) )
- disable_aac_widgets();
if( !(p->rip_musepack) )
disable_musepack_widgets();
if (!(p->rip_opus))
@@ -289,8 +283,6 @@
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->monkey_compression = (int)gtk_range_get_value(GTK_RANGE(lookup_widget(win_prefs, "monkey_compression_slider")));
- p->rip_aac = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_aac")));
- 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->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")));
@@ -439,8 +431,6 @@
fprintf(config, "%d\n", p->cddb_port_number);
fprintf(config, "%d\n", p->rip_monkey);
fprintf(config, "%d\n", p->monkey_compression);
- fprintf(config, "%d\n", p->rip_aac);
- fprintf(config, "%d\n", p->aac_quality);
fprintf(config, "%d\n", p->rip_musepack);
fprintf(config, "%d\n", p->musepack_bitrate);
fprintf(config, "%d\n", p->more_formats_expanded);
@@ -614,12 +604,6 @@
p->monkey_compression = read_line_num(fd);
// this one can be 0
- p->rip_aac = read_line_num(fd);
-
- // this one can be 0
- p->aac_quality = read_line_num(fd);
-
- // this one can be 0
p->rip_musepack = read_line_num(fd);
// this one can be 0
diff -ruN asunder-2.9.2-orig/src/prefs.h src/prefs.h
--- asunder-2.9.2-orig/src/prefs.h 2015-01-02 14:51:46.000000000 -0600
+++ src/prefs.h 2019-12-11 03:47:37.788519251 -0600
@@ -34,8 +34,6 @@
int cddb_port_number;
int rip_monkey;
int monkey_compression;
- int rip_aac;
- int aac_quality;
int rip_musepack;
int musepack_bitrate;
int more_formats_expanded;
diff -ruN asunder-2.9.2-orig/src/threads.c src/threads.c
--- asunder-2.9.2-orig/src/threads.c 2017-11-18 18:58:43.000000000 -0600
+++ src/threads.c 2019-12-11 10:11:03.183303965 -0600
@@ -41,7 +41,6 @@
static FILE * playlist_wavpack = NULL;
static FILE * playlist_monkey = NULL;
static FILE * playlist_musepack = NULL;
-static FILE * playlist_aac = NULL;
/* ripping or encoding, so that can know not to clear the tracklist on eject */
bool working;
@@ -63,7 +62,6 @@
static double wavpack_percent;
static double monkey_percent;
static double musepack_percent;
-static double aac_percent;
static int rip_tracks_completed;
static int encode_tracks_completed;
@@ -92,13 +90,11 @@
kill(pid, SIGKILL);
if ((pid = musepack_pid) != 0)
kill(pid, SIGKILL);
- if ((pid = aac_pid) != 0)
- kill(pid, SIGKILL);
/* wait until all the worker threads are done */
while (cdparanoia_pid != 0 || lame_pid != 0 || oggenc_pid != 0 ||
opusenc_pid != 0 || flac_pid != 0 || wavpack_pid != 0 || monkey_pid != 0 ||
- musepack_pid != 0 || aac_pid != 0)
+ musepack_pid != 0)
{
debugLog("w1");
usleep(100000);
@@ -120,8 +116,8 @@
gdk_flush();
working = false;
- show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numOpusOk + numFlacOk + numWavpackOk + numMonkeyOk + numMusepackOk + numAacOk,
- numCdparanoiaFailed + numLameFailed + numOggFailed + numOpusFailed + numFlacFailed + numWavpackFailed + numMonkeyFailed + numMusepackFailed + numAacFailed);
+ show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numOpusOk + numFlacOk + numWavpackOk + numMonkeyOk + numMusepackOk,
+ numCdparanoiaFailed + numLameFailed + numOggFailed + numOpusFailed + numFlacFailed + numWavpackFailed + numMonkeyFailed + numMusepackFailed);
}
// spawn needed threads and begin ripping
@@ -146,7 +142,6 @@
wavpack_percent = 0.0;
monkey_percent = 0.0;
musepack_percent = 0.0;
- aac_percent = 0.0;
rip_tracks_completed = 0;
encode_tracks_completed = 0;
@@ -178,7 +173,7 @@
// make sure there's at least one format to rip to
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_musepack && !global_prefs->rip_aac)
+ !global_prefs->rip_musepack)
{
GtkWidget * dialog;
dialog = gtk_message_dialog_new(GTK_WINDOW(win_main),
@@ -327,14 +322,6 @@
free(filename);
}
- if (global_prefs->rip_aac)
- {
- char * filename = make_filename(prefs_get_music_dir(global_prefs), albumdir, playlist, "m4a.m3u");
-
- make_playlist(filename, &playlist_aac);
-
- free(filename);
- }
}
free(albumdir);
@@ -353,7 +340,6 @@
numWavpackFailed = 0;
numMonkeyFailed = 0;
numMusepackFailed = 0;
- numAacFailed = 0;
numCdparanoiaOk = 0;
numLameOk = 0;
@@ -363,7 +349,6 @@
numWavpackOk = 0;
numMonkeyOk = 0;
numMusepackOk = 0;
- numAacOk = 0;
ripper = g_thread_create(rip, NULL, TRUE, NULL);
encoder = g_thread_create(encode, NULL, TRUE, NULL);
@@ -545,9 +530,6 @@
if (playlist_musepack)
fclose(playlist_musepack);
playlist_musepack = NULL;
- if (playlist_aac)
- fclose(playlist_aac);
- playlist_aac = NULL;
}
// the thread that handles encoding WAV files to all other formats
@@ -1088,65 +1070,6 @@
}
free(musepackfilename);
}
- if (global_prefs->rip_aac)
- {
- if (aborted)
- {
- free(albumdir);
- free(musicfilename);
- free(wavfilename);
- free(trackartist_trimmed);
- free(tracktitle_trimmed);
-
- 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);
- if(rc == 0)
- {
- gdk_threads_enter();
- if(confirmOverwrite(aacfilename))
- doEncode = true;
- else
- doEncode = false;
- gdk_threads_leave();
- }
- else
- doEncode = true;
-
- if(doEncode)
- {
- aac(tracknum, trackartist, album_title, tracktitle, album_genre, album_year,
- wavfilename, aacfilename,
- global_prefs->aac_quality,
- &aac_percent);
- }
-
- if (playlist_aac)
- {
- fprintf(playlist_aac, "#EXTINF:%d,%s - %s\n", (min*60)+sec, trackartist, tracktitle);
- fprintf(playlist_aac, "%s\n", basename(aacfilename));
- fflush(playlist_aac);
- }
- free(aacfilename);
- }
if (!global_prefs->rip_wav)
{
snprintf(logStr, 1024, "Removing track %d WAV file\n", tracknum);
@@ -1179,7 +1102,6 @@
wavpack_percent = 0.0;
monkey_percent = 0.0;
musepack_percent = 0.0;
- aac_percent = 0.0;
encode_tracks_completed++;
}
@@ -1224,7 +1146,7 @@
/* wait until all the worker threads are done */
while (cdparanoia_pid != 0 || lame_pid != 0 || oggenc_pid != 0 ||
opusenc_pid != 0 || flac_pid != 0 || wavpack_pid != 0 || monkey_pid != 0 ||
- musepack_pid != 0 || aac_pid != 0)
+ musepack_pid != 0)
{
debugLog("w2");
usleep(100000);
@@ -1243,8 +1165,8 @@
eject_disc(global_prefs->cdrom);
}
- show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numOpusOk + numFlacOk + numWavpackOk + numMonkeyOk + numMusepackOk + numAacOk,
- numCdparanoiaFailed + numLameFailed + numOggFailed + numOpusFailed + numFlacFailed + numWavpackFailed + numMonkeyFailed + numMusepackFailed + numAacFailed);
+ show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numOpusOk + numFlacOk + numWavpackOk + numMonkeyOk + numMusepackOk,
+ numCdparanoiaFailed + numLameFailed + numOggFailed + numOpusFailed + numFlacFailed + numWavpackFailed + numMonkeyFailed + numMusepackFailed );
gdk_threads_leave();
return NULL;
@@ -1269,8 +1191,6 @@
parts++;
if(global_prefs->rip_musepack)
parts++;
- if(global_prefs->rip_aac)
- parts++;
gdk_threads_enter();
GtkProgressBar * progress_total = GTK_PROGRESS_BAR(lookup_widget(win_ripping, "progress_total"));
@@ -1314,7 +1234,7 @@
{
pencode = ((double)encode_tracks_completed/(double)tracks_to_rip) +
((mp3_percent+ogg_percent+flac_percent+wavpack_percent+monkey_percent
- +opus_percent+musepack_percent+aac_percent) /
+ +opus_percent+musepack_percent) /
(parts-1) / tracks_to_rip);
snprintf(sencode, 13, "%d%% (%d/%d)", (int)(pencode*100),
(encode_tracks_completed < tracks_to_rip)
@@ -1350,10 +1270,10 @@
if ((looper % 20) == 0) {
snprintf(logStr, 1024, "completed tracks %d, rip %.2lf%%; encoded tracks %d, "
"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 monkey_pid;
pid_t musepack_pid;
-pid_t aac_pid;
int numCdparanoiaFailed;
int numLameFailed;
@@ -47,7 +46,6 @@
int numWavpackFailed;
int numMonkeyFailed;
int numMusepackFailed;
-int numAacFailed;
int numCdparanoiaOk;
int numLameOk;
@@ -57,7 +55,6 @@
int numWavpackOk;
int numMonkeyOk;
int numMusepackOk;
-int numAacOk;
int numchildren = 0;
static bool waitBeforeSigchld;
@@ -95,7 +92,6 @@
extern pid_t wavpack_pid;
extern pid_t monkey_pid;
extern pid_t musepack_pid;
-extern pid_t aac_pid;
// Signal handler to find out when our child has exited.
// Do not pot any printf or syslog into here, it causes a deadlock.
@@ -154,11 +150,6 @@
musepack_pid = 0;
numMusepackFailed++;
}
- else if (pid == aac_pid)
- {
- aac_pid = 0;
- numAacFailed++;
- }
}
else
{
@@ -203,11 +194,6 @@
musepack_pid = 0;
numMusepackOk++;
}
- else if (pid == aac_pid)
- {
- aac_pid = 0;
- numAacOk++;
- }
}
}
@@ -1344,119 +1330,3 @@
*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,
- double* progress)
-{
- const char* args[9];
- char* dynamic_args[6];
- int fd;
- int pos;
- int dyn_pos;
-
- pos = 0;
- args[pos++] = "neroAacEnc";
-
- args[pos++] = "-q";
- char qualityParam[5];
- snprintf(qualityParam, 5, "0.%d", quality);
- args[pos++] = qualityParam;
-
- args[pos++] = "-if";
- args[pos++] = wavfilename;
- args[pos++] = "-of";
- args[pos++] = aacfilename;
- args[pos++] = NULL;
-
- fd = exec_with_output(args, STDERR_FILENO, &aac_pid, NULL);
-
- int size;
- char buf[256];
- do
- {
- /* The Nero encoder doesn't give me an estimate for completion
- * or any way to estimate it myself, just the number of seconds
- * done. So just sit in here until the program exits */
- 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("w11\n");
- 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++];
- }
- if (asprintf(&dynamic_args[dyn_pos], "-meta:title=%s", title) > 0)
- {
- args[pos++] = dynamic_args[dyn_pos++];
- }
- 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 monkey_pid;
extern pid_t musepack_pid;
-extern pid_t aac_pid;
extern int numCdparanoiaFailed;
extern int numLameFailed;
@@ -19,7 +18,6 @@
extern int numWavpackFailed;
extern int numMonkeyFailed;
extern int numMusepackFailed;
-extern int numAacFailed;
extern int numCdparanoiaOk;
extern int numLameOk;
@@ -29,7 +27,6 @@
extern int numWavpackOk;
extern int numMonkeyOk;
extern int numMusepackOk;
-extern int numAacOk;
// signal handler to find out when out child has exited
void sigchld(int signum);
@@ -196,13 +193,3 @@
int quality,
double* progress);
-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,
- double* progress);