Commit 9fc2efb3 authored by Pablo Correa 's avatar Pablo Correa

modified: DATA/asunder/asunder.4061-aac.patch

	modified:   DATA/asunder/asunder.4061-monkey.patch
parent ee3674d9
diff -ruN ../asunder-2.0-orig/src/callbacks.c src/callbacks.c
--- ../asunder-2.0-orig/src/callbacks.c 2010-01-23 16:21:15.000000000 +0000
+++ src/callbacks.c 2011-11-08 18:10:15.000000000 +0000
@@ -510,31 +510,6 @@
@@ -569,31 +569,6 @@
}
void
......@@ -36,7 +36,7 @@ diff -ruN ../asunder-2.0-orig/src/callbacks.c src/callbacks.c
diff -ruN ../asunder-2.0-orig/src/callbacks.h src/callbacks.h
--- ../asunder-2.0-orig/src/callbacks.h 2010-01-23 16:21:15.000000000 +0000
+++ src/callbacks.h 2011-11-08 18:20:03.000000000 +0000
@@ -164,9 +164,6 @@
@@ -176,9 +176,6 @@
on_rip_monkey_toggled (GtkToggleButton *togglebutton,
gpointer user_data);
void
......@@ -112,7 +112,7 @@ diff -ruN ../asunder-2.0-orig/src/interface.c src/interface.c
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);
@@ -1297,18 +1242,6 @@
@@ -1413,18 +1357,6 @@
gtk_widget_set_sensitive(lookup_widget(win_prefs, "monkey_compression_slider"), TRUE);
}
......@@ -144,7 +144,7 @@ diff -ruN ../asunder-2.0-orig/src/interface.c src/interface.c
diff -ruN ../asunder-2.0-orig/src/interface.h src/interface.h
--- ../asunder-2.0-orig/src/interface.h 2009-08-25 01:32:28.000000000 +0000
+++ src/interface.h 2011-11-08 18:08:28.000000000 +0000
@@ -15,8 +15,6 @@
@@ -17,8 +17,6 @@
void enable_wavpack_widgets(void);
void disable_monkey_widgets(void);
void enable_monkey_widgets(void);
......@@ -152,11 +152,11 @@ diff -ruN ../asunder-2.0-orig/src/interface.h src/interface.h
-void enable_aac_widgets(void);
void disable_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
--- ../asunder-2.0-orig/src/prefs.c 2009-08-25 01:32:28.000000000 +0000
+++ src/prefs.c 2011-11-08 18:14:40.000000000 +0000
@@ -122,8 +122,6 @@
@@ -125,8 +125,6 @@
p->wavpack_bitrate = 3;
p->rip_monkey = 0;
p->monkey_compression = 2;
......@@ -164,8 +164,8 @@ diff -ruN ../asunder-2.0-orig/src/prefs.c src/prefs.c
- p->aac_quality = 60;
p->rip_musepack = 0;
p->musepack_bitrate = 2;
@@ -184,8 +182,6 @@
p->rip_opus = 0;
@@ -191,8 +189,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);
......@@ -173,8 +173,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_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, "eject_on_done")), p->eject_on_done);
@@ -216,8 +212,6 @@
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_opus")), p->rip_opus);
@@ -225,8 +221,6 @@
enable_wavpack_widgets(); /* need this to potentially disable hybrid widgets */
if( !(p->rip_monkey) )
disable_monkey_widgets();
......@@ -182,8 +182,8 @@ diff -ruN ../asunder-2.0-orig/src/prefs.c src/prefs.c
- disable_aac_widgets();
if( !(p->rip_musepack) )
disable_musepack_widgets();
}
@@ -275,8 +269,6 @@
if (!(p->rip_opus))
@@ -287,8 +281,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")));
......@@ -191,8 +191,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->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")));
@@ -358,8 +350,6 @@
p->rip_opus = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_opus")));
@@ -396,8 +388,6 @@
fprintf(config, "%d\n", p->cddb_port_number);
fprintf(config, "%d\n", p->rip_monkey);
fprintf(config, "%d\n", p->monkey_compression);
......@@ -201,7 +201,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->musepack_bitrate);
fprintf(config, "%d\n", p->more_formats_expanded);
@@ -537,12 +527,6 @@
@@ -571,12 +561,6 @@
p->monkey_compression = read_line_num(fd);
// this one can be 0
......@@ -229,7 +229,7 @@ diff -ruN ../asunder-2.0-orig/src/prefs.h src/prefs.h
diff -ruN ../asunder-2.0-orig/src/threads.c src/threads.c
--- ../asunder-2.0-orig/src/threads.c 2010-05-01 22:27:47.000000000 +0000
+++ src/threads.c 2011-11-08 18:21:22.000000000 +0000
@@ -39,7 +39,6 @@
@@ -41,7 +41,6 @@
static FILE * playlist_wavpack = NULL;
static FILE * playlist_monkey = NULL;
static FILE * playlist_musepack = NULL;
......@@ -237,7 +237,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 */
bool working;
@@ -60,7 +59,6 @@
@@ -63,7 +62,6 @@
static double wavpack_percent;
static double monkey_percent;
static double musepack_percent;
......@@ -245,7 +245,7 @@ diff -ruN ../asunder-2.0-orig/src/threads.c src/threads.c
static int rip_tracks_completed;
static int encode_tracks_completed;
@@ -86,13 +84,11 @@
@@ -91,13 +89,11 @@
kill(monkey_pid, SIGKILL);
if (musepack_pid != 0)
kill(musepack_pid, SIGKILL);
......@@ -260,7 +260,7 @@ diff -ruN ../asunder-2.0-orig/src/threads.c src/threads.c
{
debugLog("w1");
usleep(100000);
@@ -114,8 +110,8 @@
@@ -119,8 +115,8 @@
gdk_flush();
working = false;
......@@ -271,7 +271,7 @@ diff -ruN ../asunder-2.0-orig/src/threads.c src/threads.c
}
// spawn needed threads and begin ripping
@@ -134,7 +130,6 @@
@@ -141,7 +137,6 @@
wavpack_percent = 0.0;
monkey_percent = 0.0;
musepack_percent = 0.0;
......@@ -279,16 +279,16 @@ diff -ruN ../asunder-2.0-orig/src/threads.c src/threads.c
rip_tracks_completed = 0;
encode_tracks_completed = 0;
@@ -161,7 +156,7 @@
@@ -173,7 +168,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 &&
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),
@@ -291,14 +286,6 @@
@@ -322,14 +317,6 @@
free(filename);
}
......@@ -303,7 +303,7 @@ diff -ruN ../asunder-2.0-orig/src/threads.c src/threads.c
}
free(albumdir);
@@ -313,7 +300,6 @@
@@ -348,7 +335,6 @@
numWavpackFailed = 0;
numMonkeyFailed = 0;
numMusepackFailed = 0;
......@@ -311,7 +311,7 @@ diff -ruN ../asunder-2.0-orig/src/threads.c src/threads.c
numCdparanoiaOk = 0;
numLameOk = 0;
@@ -322,7 +308,6 @@
@@ -358,7 +344,6 @@
numWavpackOk = 0;
numMonkeyOk = 0;
numMusepackOk = 0;
......@@ -319,7 +319,7 @@ diff -ruN ../asunder-2.0-orig/src/threads.c src/threads.c
ripper = g_thread_create(rip, NULL, TRUE, NULL);
encoder = g_thread_create(encode, NULL, TRUE, NULL);
@@ -461,7 +446,6 @@
@@ -538,7 +524,6 @@
char* wavpackfilename2 = NULL;
char* monkeyfilename = NULL;
char* musepackfilename = NULL;
......@@ -327,7 +327,7 @@ diff -ruN ../asunder-2.0-orig/src/threads.c src/threads.c
struct stat statStruct;
bool doEncode;
@@ -541,7 +525,6 @@
@@ -652,7 +636,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");
......@@ -379,7 +379,7 @@ diff -ruN ../asunder-2.0-orig/src/threads.c src/threads.c
if (!global_prefs->rip_wav)
{
snprintf(logStr, 1024, "Removing track %d WAV file\n", tracknum);
@@ -806,10 +754,9 @@
@@ -967,10 +913,9 @@
free(wavpackfilename2);
free(monkeyfilename);
free(musepackfilename);
......@@ -390,7 +390,7 @@ diff -ruN ../asunder-2.0-orig/src/threads.c src/threads.c
mp3_percent = 0.0;
ogg_percent = 0.0;
@@ -814,7 +761,6 @@
@@ -979,7 +924,6 @@
wavpack_percent = 0.0;
monkey_percent = 0.0;
musepack_percent = 0.0;
......@@ -398,7 +398,7 @@ diff -ruN ../asunder-2.0-orig/src/threads.c src/threads.c
encode_tracks_completed++;
}
@@ -843,8 +789,6 @@
@@ -1014,8 +958,6 @@
playlist_monkey = NULL;
if (playlist_musepack) fclose(playlist_musepack);
playlist_musepack = NULL;
......@@ -407,7 +407,7 @@ diff -ruN ../asunder-2.0-orig/src/threads.c src/threads.c
g_mutex_free(barrier);
barrier = NULL;
@@ -854,7 +798,7 @@
@@ -1025,7 +967,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 ||
......@@ -416,7 +416,7 @@ diff -ruN ../asunder-2.0-orig/src/threads.c src/threads.c
{
debugLog("w2");
usleep(100000);
@@ -867,8 +811,8 @@
@@ -1038,8 +980,8 @@
gtk_widget_hide(win_ripping);
gdk_flush();
......@@ -427,7 +427,7 @@ diff -ruN ../asunder-2.0-orig/src/threads.c src/threads.c
gdk_threads_leave();
return NULL;
@@ -890,8 +834,6 @@
@@ -1064,8 +1006,6 @@
parts++;
if(global_prefs->rip_musepack)
parts++;
......@@ -436,7 +436,7 @@ diff -ruN ../asunder-2.0-orig/src/threads.c src/threads.c
gdk_threads_enter();
GtkProgressBar * progress_total = GTK_PROGRESS_BAR(lookup_widget(win_ripping, "progress_total"));
@@ -926,11 +868,11 @@
@@ -1100,11 +1040,11 @@
snprintf(logStr, 1024, "completed tracks %d, rip %.2lf%%; encoded tracks %d, "
"mp3 %.2lf%% ogg %.2lf%% opus %.2lf%% flac %.2lf%% wavpack %.2lf%% "
......@@ -450,7 +450,7 @@ diff -ruN ../asunder-2.0-orig/src/threads.c src/threads.c
prip = (rip_tracks_completed+rip_percent) / tracks_to_rip;
snprintf(srip, 13, "%d%% (%d/%d)", (int)(prip*100),
@@ -941,7 +883,7 @@
@@ -1116,7 +1056,7 @@
{
pencode = ((double)encode_tracks_completed/(double)tracks_to_rip) +
((mp3_percent+ogg_percent+flac_percent+wavpack_percent+monkey_percent
......@@ -462,7 +462,7 @@ diff -ruN ../asunder-2.0-orig/src/threads.c src/threads.c
diff -ruN ../asunder-2.0-orig/src/wrappers.c src/wrappers.c
--- ../asunder-2.0-orig/src/wrappers.c 2010-07-17 12:13:29.000000000 +0000
+++ src/wrappers.c 2011-11-08 18:19:07.000000000 +0000
@@ -34,7 +34,6 @@
@@ -37,7 +37,6 @@
pid_t wavpack_pid;
pid_t monkey_pid;
pid_t musepack_pid;
......@@ -470,7 +470,7 @@ diff -ruN ../asunder-2.0-orig/src/wrappers.c src/wrappers.c
int numCdparanoiaFailed;
int numLameFailed;
@@ -43,7 +42,6 @@
@@ -47,7 +46,6 @@
int numWavpackFailed;
int numMonkeyFailed;
int numMusepackFailed;
......@@ -478,7 +478,7 @@ diff -ruN ../asunder-2.0-orig/src/wrappers.c src/wrappers.c
int numCdparanoiaOk;
int numLameOk;
@@ -52,7 +50,6 @@
@@ -57,7 +55,6 @@
int numWavpackOk;
int numMonkeyOk;
int numMusepackOk;
......@@ -486,15 +486,15 @@ diff -ruN ../asunder-2.0-orig/src/wrappers.c src/wrappers.c
int numchildren = 0;
static bool waitBeforeSigchld;
@@ -89,7 +86,6 @@
@@ -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
void sigchld(int signum)
@@ -166,11 +162,6 @@
// 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++;
}
......@@ -506,7 +506,7 @@ diff -ruN ../asunder-2.0-orig/src/wrappers.c src/wrappers.c
}
else
{
@@ -210,10 +201,5 @@
@@ -203,11 +194,6 @@
musepack_pid = 0;
numMusepackOk++;
}
......@@ -517,6 +517,7 @@ diff -ruN ../asunder-2.0-orig/src/wrappers.c src/wrappers.c
- }
}
}
@@ -1123,118 +967,3 @@
}
}
......@@ -639,7 +640,7 @@ diff -ruN ../asunder-2.0-orig/src/wrappers.c src/wrappers.c
diff -ruN ../asunder-2.0-orig/src/wrappers.h src/wrappers.h
--- ../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
@@ -8,7 +8,6 @@
@@ -9,7 +9,6 @@
extern pid_t wavpack_pid;
extern pid_t monkey_pid;
extern pid_t musepack_pid;
......@@ -647,7 +648,7 @@ diff -ruN ../asunder-2.0-orig/src/wrappers.h src/wrappers.h
extern int numCdparanoiaFailed;
extern int numLameFailed;
@@ -17,7 +16,6 @@
@@ -19,7 +18,6 @@
extern int numWavpackFailed;
extern int numMonkeyFailed;
extern int numMusepackFailed;
......@@ -655,7 +656,7 @@ diff -ruN ../asunder-2.0-orig/src/wrappers.h src/wrappers.h
extern int numCdparanoiaOk;
extern int numLameOk;
@@ -26,7 +24,6 @@
@@ -29,7 +27,6 @@
extern int numWavpackOk;
extern int numMonkeyOk;
extern int numMusepackOk;
......@@ -663,7 +664,7 @@ diff -ruN ../asunder-2.0-orig/src/wrappers.h src/wrappers.h
// signal handler to find out when out child has exited
void sigchld(int signum);
@@ -130,13 +127,3 @@
@@ -154,13 +151,3 @@
int quality,
double* progress);
......
diff -ruN src-monkey/callbacks.c src/callbacks.c
--- src-monkey/callbacks.c 2011-11-08 19:18:12.000000000 +0000
+++ src/callbacks.c 2011-11-08 19:29:08.000000000 +0000
@@ -485,31 +485,6 @@
@@ -544,31 +544,6 @@
}
void
......@@ -36,7 +36,7 @@ diff -ruN src-monkey/callbacks.c src/callbacks.c
diff -ruN src-monkey/callbacks.h src/callbacks.h
--- src-monkey/callbacks.h 2011-11-08 19:18:12.000000000 +0000
+++ src/callbacks.h 2011-11-08 19:29:26.000000000 +0000
@@ -161,9 +161,6 @@
@@ -173,9 +173,6 @@
on_rip_wavpack_toggled (GtkToggleButton *togglebutton,
gpointer user_data);
void
......@@ -49,7 +49,7 @@ diff -ruN src-monkey/callbacks.h src/callbacks.h
diff -ruN src-monkey/interface.c src/interface.c
--- src-monkey/interface.c 2011-11-08 19:18:12.000000000 +0000
+++ src/interface.c 2011-11-08 19:30:02.000000000 +0000
@@ -907,54 +907,6 @@
@@ -906,54 +906,6 @@
GLADE_HOOKUP_OBJECT (prefs, rip_musepack, "rip_musepack");
/* END MUSEPACK */
......@@ -104,7 +104,7 @@ diff -ruN src-monkey/interface.c src/interface.c
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);
@@ -1230,18 +1183,6 @@
@@ -1345,18 +1297,6 @@
}
}
......@@ -123,7 +123,7 @@ diff -ruN src-monkey/interface.c src/interface.c
void disable_musepack_widgets(void)
{
gtk_widget_set_sensitive(lookup_widget(win_prefs, "musepack_bitrate_lbl"), FALSE);
@@ -1478,7 +1419,7 @@
@@ -1694,7 +1634,7 @@
static const char*
GBLcomments =
N_("An application to save tracks from an Audio CD \n"
......@@ -135,19 +135,19 @@ diff -ruN src-monkey/interface.c src/interface.c
diff -ruN src-monkey/interface.h src/interface.h
--- src-monkey/interface.h 2011-11-08 19:18:12.000000000 +0000
+++ src/interface.h 2011-11-08 19:30:17.000000000 +0000
@@ -13,8 +13,6 @@
void enable_ogg_widgets(void);
@@ -15,8 +15,6 @@
void enable_opus_widgets(void);
void disable_wavpack_widgets(void);
void enable_wavpack_widgets(void);
-void disable_monkey_widgets(void);
-void enable_monkey_widgets(void);
void disable_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
--- src-monkey/prefs.c 2011-11-08 19:18:12.000000000 +0000
+++ src/prefs.c 2011-11-08 19:31:23.000000000 +0000
@@ -120,8 +120,6 @@
@@ -123,8 +123,6 @@
p->wavpack_compression = 1;
p->wavpack_hybrid = 1;
p->wavpack_bitrate = 3;
......@@ -155,8 +155,8 @@ diff -ruN src-monkey/prefs.c src/prefs.c
- p->monkey_compression = 2;
p->rip_musepack = 0;
p->musepack_bitrate = 2;
@@ -180,8 +178,6 @@
p->rip_opus = 0;
@@ -187,8 +185,6 @@
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_range_set_value(GTK_RANGE(lookup_widget(win_prefs, "wavpack_bitrate_slider")), p->wavpack_bitrate);
......@@ -164,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_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, "eject_on_done")), p->eject_on_done);
@@ -210,8 +206,6 @@
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_opus")), p->rip_opus);
@@ -219,8 +215,6 @@
disable_wavpack_widgets();
else
enable_wavpack_widgets(); /* need this to potentially disable hybrid widgets */
......@@ -173,8 +173,8 @@ diff -ruN src-monkey/prefs.c src/prefs.c
- disable_monkey_widgets();
if( !(p->rip_musepack) )
disable_musepack_widgets();
}
@@ -267,8 +261,6 @@
if (!(p->rip_opus))
@@ -279,8 +273,6 @@
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_bitrate = (int)gtk_range_get_value(GTK_RANGE(lookup_widget(win_prefs, "wavpack_bitrate_slider")));
......@@ -182,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->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")));
@@ -348,8 +340,6 @@
p->rip_opus = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_opus")));
@@ -386,8 +378,6 @@
fprintf(config, "%d\n", p->do_log);
fprintf(config, "%s\n", p->cddb_server_name);
fprintf(config, "%d\n", p->cddb_port_number);
......@@ -192,7 +192,7 @@ diff -ruN src-monkey/prefs.c src/prefs.c
fprintf(config, "%d\n", p->rip_musepack);
fprintf(config, "%d\n", p->musepack_bitrate);
fprintf(config, "%d\n", p->more_formats_expanded);
@@ -521,12 +511,6 @@
@@ -555,12 +545,6 @@
}
// this one can be 0
......@@ -220,23 +220,23 @@ diff -ruN src-monkey/prefs.h src/prefs.h
diff -ruN src-monkey/threads.c src/threads.c
--- src-monkey/threads.c 2011-11-08 19:18:12.000000000 +0000
+++ src/threads.c 2011-11-08 19:28:27.000000000 +0000
@@ -37,7 +37,6 @@
static FILE * playlist_ogg = NULL;
@@ -39,7 +39,6 @@
static FILE * playlist_opus = NULL;
static FILE * playlist_flac = NULL;
static FILE * playlist_wavpack = NULL;
-static FILE * playlist_monkey = NULL;
static FILE * playlist_musepack = NULL;
/* ripping or encoding, so that can know not to clear the tracklist on eject */
@@ -57,7 +56,6 @@
static double ogg_percent;
@@ -60,7 +59,6 @@
static double opus_percent;
static double flac_percent;
static double wavpack_percent;
-static double monkey_percent;
static double musepack_percent;
static int rip_tracks_completed;
static int encode_tracks_completed;
@@ -80,14 +78,12 @@
@@ -85,14 +83,12 @@
kill(flac_pid, SIGKILL);
if (wavpack_pid != 0)
kill(wavpack_pid, SIGKILL);
......@@ -252,7 +252,7 @@ diff -ruN src-monkey/threads.c src/threads.c
musepack_pid != 0)
{
debugLog("w1");
@@ -110,8 +106,8 @@
@@ -115,8 +111,8 @@
gdk_flush();
working = false;
......@@ -263,15 +263,15 @@ diff -ruN src-monkey/threads.c src/threads.c
}
// spawn needed threads and begin ripping
@@ -128,7 +124,6 @@
ogg_percent = 0.0;
@@ -135,7 +131,6 @@
opus_percent = 0.0;
flac_percent = 0.0;
wavpack_percent = 0.0;
- monkey_percent = 0.0;
musepack_percent = 0.0;
rip_tracks_completed = 0;
encode_tracks_completed = 0;
@@ -155,7 +150,7 @@
@@ -167,7 +162,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 &&
......@@ -280,7 +280,7 @@ diff -ruN src-monkey/threads.c src/threads.c
!global_prefs->rip_musepack )
{
GtkWidget * dialog;
@@ -270,19 +265,11 @@
@@ -301,19 +296,11 @@
free(filename);
}
......@@ -301,23 +301,23 @@ diff -ruN src-monkey/threads.c src/threads.c
free(filename);
}
@@ -298,7 +285,6 @@
numOggFailed = 0;
@@ -333,7 +320,6 @@
numOpusFailed = 0;
numFlacFailed = 0;
numWavpackFailed = 0;
- numMonkeyFailed = 0;
numMusepackFailed = 0;
numCdparanoiaOk = 0;
@@ -306,7 +292,6 @@
numOggOk = 0;
@@ -342,7 +328,6 @@
numOpusOk = 0;
numFlacOk = 0;
numWavpackOk = 0;
- numMonkeyOk = 0;
numMusepackOk = 0;
ripper = g_thread_create(rip, NULL, TRUE, NULL);
@@ -444,7 +429,6 @@
@@ -521,7 +506,6 @@
char* flacfilename = NULL;
char* wavpackfilename = NULL;
char* wavpackfilename2 = NULL;
......@@ -325,7 +325,7 @@ diff -ruN src-monkey/threads.c src/threads.c
char* musepackfilename = NULL;
struct stat statStruct;
bool doEncode;
@@ -523,7 +507,6 @@
@@ -634,7 +618,6 @@
flacfilename = make_filename(prefs_get_music_dir(global_prefs), albumdir, musicfilename, "flac");
wavpackfilename = make_filename(prefs_get_music_dir(global_prefs), albumdir, musicfilename, "wv");
wavpackfilename2 = make_filename(prefs_get_music_dir(global_prefs), albumdir, musicfilename, "wvc");
......@@ -333,7 +333,7 @@ diff -ruN src-monkey/threads.c src/threads.c
musepackfilename = make_filename(prefs_get_music_dir(global_prefs), albumdir, musicfilename, "mpc");
if (global_prefs->rip_mp3)
@@ -658,41 +641,5 @@
@@ -811,42 +794,6 @@
fflush(playlist_wavpack);
}
}
......@@ -375,9 +375,8 @@ diff -ruN src-monkey/threads.c src/threads.c
- }
if (global_prefs->rip_musepack)
{
@@ -909,20 +894,18 @@
free(oggfilename);
free(opusfilename);
snprintf(logStr, 1024, "Encoding track %d to \"%s\"\n", tracknum, musepackfilename);
@@ -911,18 +858,16 @@
free(flacfilename);
free(wavpackfilename);
free(wavpackfilename2);
......@@ -396,7 +395,7 @@ diff -ruN src-monkey/threads.c src/threads.c
musepack_percent = 0.0;
encode_tracks_completed++;
}
@@ -785,8 +731,6 @@
@@ -954,8 +899,6 @@
playlist_flac = NULL;
if (playlist_wavpack) fclose(playlist_wavpack);
playlist_wavpack = NULL;
......@@ -405,7 +404,7 @@ diff -ruN src-monkey/threads.c src/threads.c
if (playlist_musepack) fclose(playlist_musepack);
playlist_musepack = NULL;
@@ -797,7 +741,7 @@
@@ -966,7 +909,7 @@
/* wait until all the worker threads are done */
while (cdparanoia_pid != 0 || lame_pid != 0 || oggenc_pid != 0 ||
......@@ -414,7 +413,7 @@ diff -ruN src-monkey/threads.c src/threads.c
musepack_pid != 0 )
{
debugLog("w2");
@@ -811,8 +755,8 @@
@@ -980,8 +923,8 @@
gtk_widget_hide(win_ripping);
gdk_flush();
......@@ -425,7 +424,7 @@ diff -ruN src-monkey/threads.c src/threads.c
gdk_threads_leave();
return NULL;
@@ -830,8 +774,6 @@
@@ -1002,8 +945,6 @@
parts++;
if(global_prefs->rip_wavpack)
parts++;
......@@ -434,7 +433,7 @@ diff -ruN src-monkey/threads.c src/threads.c
if(global_prefs->rip_musepack)
parts++;
@@ -868,11 +810,11 @@
@@ -1040,11 +981,11 @@
snprintf(logStr, 1024, "completed tracks %d, rip %.2lf%%; encoded tracks %d, "
"mp3 %.2lf%% ogg %.2lf%% opus %.2lf%% flac %.2lf%% wavpack %.2lf%% "
......@@ -448,7 +447,7 @@ diff -ruN src-monkey/threads.c src/threads.c
prip = (rip_tracks_completed+rip_percent) / tracks_to_rip;
snprintf(srip, 13, "%d%% (%d/%d)", (int)(prip*100),
@@ -882,7 +824,7 @@
@@ -1055,7 +996,7 @@
if (parts > 1)
{
pencode = ((double)encode_tracks_completed/(double)tracks_to_rip) +
......@@ -460,7 +459,8 @@ diff -ruN src-monkey/threads.c src/threads.c
diff -ruN src-monkey/util.c src/util.c
--- src-monkey/util.c 2017-12-07 00:09:30.000000000 +0000
+++ src/util.c 2017-12-07 00:09:30.000000000 +0000
@@ -39,25 +39,5 @@
@@ -39,26 +39,6 @@
fprintf(stderr, "Fatal error: %s\n", message);
exit(-1);
}
-
......@@ -489,52 +489,48 @@ diff -ruN src-monkey/util.c src/util.c
diff -ruN src-monkey/util.h src/util.h
--- src-monkey/util.h 2011-11-08 19:18:12.000000000 +0000
+++ src/util.h 2011-11-08 19:32:52.000000000 +0000
@@ +5,4 -5,4 @@
@@ -5,5 +5,4 @@
void fatalError(const char* message);
-int int_to_monkey_int(int i);
int int_to_vbr_int(int i);
int int_to_bitrate(int i, bool vbr);
int int_to_wavpack_bitrate(int i);
int int_to_musepack_bitrate(int i);
int int_to_musepack_int(int i);
diff -ruN src-monkey/wrappers.c src/wrappers.c
--- src-monkey/wrappers.c 2011-11-08 19:18:12.000000000 +0000
+++ src/wrappers.c 2011-11-08 19:21:50.000000000 +0000
@@ -32,7 +32,6 @@
pid_t oggenc_pid;
@@ -35,7 +35,6 @@
pid_t opusenc_pid;
pid_t flac_pid;
pid_t wavpack_pid;
-pid_t monkey_pid;
pid_t musepack_pid;
int numCdparanoiaFailed;