Commit 8024924d by Ruben Rodriguez

Initial release for Brigantia

parent 451ad817

Too many changes to show.

To preserve performance only 120 of 120+ files are displayed.

#!/bin/sh -e
## 02_branding.dpatch by Adam Conrad <adconrad@0c3.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Changes apache's PLATFORM based on lsb_release output
BUILD_DIST="($(lsb_release -i -s) GNU/Linux)"
if [ $# -ne 1 ]; then
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1
fi
case "$1" in
-patch)
if grep -q "${BUILD_DIST}" server/core.c 2>/dev/null; then
echo >&2 "`basename $0`: patch already applied"
exit 1
else
# This is where we get our distribution-specific server signature from:
sed -i -e "s:(\" PLATFORM \"):${BUILD_DIST}:" server/core.c
fi
;;
-unpatch)
if grep -q "${BUILD_DIST}" server/core.c 2>/dev/null; then
sed -i -e "s:${BUILD_DIST}:(\" PLATFORM \"):" server/core.c
else
echo >&2 "`basename $0`: patch not yet applied, cannot unpatch"
exit 1
fi
;;
*)
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1
;;
esac
Index: gnome-menus-2.28.0/layout/applications.menu
===================================================================
--- gnome-menus-2.28.0.orig/layout/applications.menu 2009-09-24 11:34:44.000000000 +0200
+++ gnome-menus-2.28.0/layout/applications.menu 2009-09-24 11:34:44.000000000 +0200
@@ -157,4 +157,29 @@
<Directory>Debian.directory</Directory>
</Menu>
+<Include>
+ <Filename>gnome-app-install.desktop</Filename>
+</Include>
+
+<!-- Separator between menus and gnome-app-install -->
+<Layout>
+ <Merge type="menus"/>
+ <Menuname>Internet</Menuname>
+ <Menuname>Office</Menuname>
+ <Menuname>Education</Menuname>
+ <Menuname>Development</Menuname>
+ <Menuname>Graphics</Menuname>
+ <Menuname>Multimedia</Menuname>
+ <Menuname>Games</Menuname>
+ <Menuname>Accessories</Menuname>
+ <Menuname>System</Menuname>
+ <Menuname>Universal Access</Menuname>
+ <Menuname>Debian</Menuname>
+ <Menuname>Other</Menuname>
+ <Menuname>wine-wine</Menuname>
+ <Merge type="files"/>
+ <Separator/>
+ <Filename>gnome-app-install.desktop</Filename>
+</Layout>
+
</Menu> <!-- End Applications -->
Index: gnome-menus-2.28.0/layout/settings.menu
===================================================================
--- gnome-menus-2.28.0.orig/layout/settings.menu 2009-09-24 11:34:47.000000000 +0200
+++ gnome-menus-2.28.0/layout/settings.menu 2009-09-24 11:35:22.000000000 +0200
@@ -43,6 +43,7 @@
<And>
<Category>Settings</Category>
<Category>System</Category>
+ <Not><Filename>gnome-app-install.desktop</Filename></Not>
</And>
</Include>
</Menu> <!-- End System Settings -->
<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
"http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
<Menu>
<Name>Applications</Name>
<Directory>X-GNOME-Menu-Applications.directory</Directory>
<AppDir>.</AppDir>
<!-- we disable those here, otherwise we see e.g. wine menus -->
<!-- Read standard .directory and .desktop file locations -->
<!-- <DefaultAppDirs/> -->
<!-- Read in overrides and child menus from applications-merged/ -->
<!-- <DefaultMergeDirs/> -->
<DefaultDirectoryDirs/>
<!-- Accessories submenu -->
<Menu>
<Name>Accessories</Name>
<Directory>Utility.directory</Directory>
<Include>
<And>
<Category>Utility</Category>
<!-- Accessibility spec must have either the Utility or Settings
category, and we display an accessibility submenu already for
the ones that do not have Settings, so don't display accessibility
applications here -->
<Not><Category>Accessibility</Category></Not>
<Not><Category>System</Category></Not>
</And>
</Include>
</Menu> <!-- End Accessories -->
<!-- Accessibility submenu -->
<Menu>
<Name>Universal Access</Name>
<Directory>Utility-Accessibility.directory</Directory>
<Include>
<And>
<Category>Accessibility</Category>
<Not><Category>Settings</Category></Not>
</And>
</Include>
</Menu> <!-- End Accessibility -->
<!-- Development Tools -->
<Menu>
<Name>Development</Name>
<Directory>Development.directory</Directory>
<Include>
<And>
<Category>Development</Category>
</And>
<Filename>emacs.desktop</Filename>
</Include>
</Menu> <!-- End Development Tools -->
<!-- Education -->
<Menu>
<Name>Education</Name>
<Directory>Education.directory</Directory>
<Include>
<And>
<Category>Education</Category>
<Not><Category>Science</Category></Not>
</And>
</Include>
</Menu> <!-- End Education -->
<!-- Science -->
<Menu>
<Name>Science</Name>
<Directory>GnomeScience.directory</Directory>
<Include>
<And>
<Category>Education</Category>
<Category>Science</Category>
</And>
</Include>
</Menu> <!-- End Science -->
<!-- Games -->
<Menu>
<Name>Games</Name>
<Directory>Game.directory</Directory>
<Include>
<And>
<Category>Game</Category>
</And>
</Include>
</Menu> <!-- End Games -->
<!-- Graphics -->
<Menu>
<Name>Graphics</Name>
<Directory>Graphics.directory</Directory>
<Include>
<And>
<Category>Graphics</Category>
</And>
</Include>
</Menu> <!-- End Graphics -->
<!-- Internet -->
<Menu>
<Name>Internet</Name>
<Directory>Network.directory</Directory>
<Include>
<And>
<Category>Network</Category>
</And>
</Include>
</Menu> <!-- End Internet -->
<!-- Multimedia -->
<Menu>
<Name>Multimedia</Name>
<Directory>AudioVideo.directory</Directory>
<Include>
<And>
<Category>AudioVideo</Category>
</And>
</Include>
</Menu> <!-- End Multimedia -->
<!-- Office -->
<Menu>
<Name>Office</Name>
<Directory>Office.directory</Directory>
<Include>
<And>
<Category>Office</Category>
</And>
</Include>
</Menu> <!-- End Office -->
<!-- System Tools-->
<Menu>
<Name>System</Name>
<Directory>System-Tools.directory</Directory>
<Include>
<And>
<Category>System</Category>
<!-- <Not><Category>Settings</Category></Not> -->
<!-- <Not><Category>Game</Category></Not> -->
</And>
</Include>
</Menu> <!-- End System Tools -->
<!-- Other -->
<Menu>
<Name>Other</Name>
<Directory>X-GNOME-Other.directory</Directory>
<OnlyUnallocated/>
<Include>
<And>
<Category>Application</Category>
<Not><Category>Core</Category></Not>
<!-- <Not><Category>Settings</Category></Not> -->
<Not><Category>Screensaver</Category></Not>
</And>
</Include>
</Menu> <!-- End Other -->
</Menu> <!-- End Applications -->
############# config ##################
#
# set base_path /var/spool/apt-mirror
#
# set mirror_path $base_path/mirror
# set skel_path $base_path/skel
# set var_path $base_path/var
# set cleanscript $var_path/clean.sh
# set defaultarch <running host architecture>
# set postmirror_script $var_path/postmirror.sh
# set run_postmirror 0
set nthreads 20
set _tilde 0
#
############# end config ##############
deb http://archive.trisquel.info/trisquel @CODENAME@ main
deb http://archive.trisquel.info/trisquel @CODENAME@-security main
deb http://archive.trisquel.info/trisquel @CODENAME@-updates main
deb http://archive.trisquel.info/trisquel @CODENAME@-backports main
deb-src http://archive.trisquel.info/trisquel @CODENAME@ main
deb-src http://archive.trisquel.info/trisquel @CODENAME@-security main
deb-src http://archive.trisquel.info/trisquel @CODENAME@-updates main
deb-src http://archive.trisquel.info/trisquel @CODENAME@-backports main
clean http://archive.trisquel.info/trisquel
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 @@
}
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.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 @@
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.0-orig/src/interface.c src/interface.c
--- ../asunder-2.0-orig/src/interface.c 2010-07-17 11:44:06.000000000 +0000
+++ src/interface.c 2011-11-08 18:09:31.000000000 +0000
@@ -863,61 +863,6 @@
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_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);
@@ -1297,18 +1242,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);
@@ -1545,8 +1478,7 @@
static const char*
GBLcomments =
N_("An application to save tracks from an Audio CD \n"
-"as WAV, MP3, OGG, FLAC, Wavpack, 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.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 @@
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);
#if GTK_MINOR_VERSION >= 6
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 @@
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;
@@ -184,8 +182,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, "eject_on_done")), p->eject_on_done);
@@ -216,8 +212,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();
}
@@ -275,8 +269,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")));
@@ -358,8 +350,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);
@@ -537,12 +527,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.0-orig/src/prefs.h src/prefs.h
--- ../asunder-2.0-orig/src/prefs.h 2009-09-01 03:22:41.000000000 +0000
+++ src/prefs.h 2011-11-08 18:20:15.000000000 +0000
@@ -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.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 @@
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;
@@ -60,7 +59,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;
@@ -86,13 +84,11 @@
kill(monkey_pid, SIGKILL);
if (musepack_pid != 0)
kill(musepack_pid, SIGKILL);
- if (aac_pid != 0)
- kill(aac_pid, SIGKILL);
/* wait until all the worker threads are done */
while (cdparanoia_pid != 0 || lame_pid != 0 || oggenc_pid != 0 ||
flac_pid != 0 || wavpack_pid != 0 || monkey_pid != 0 ||
- musepack_pid != 0 || aac_pid != 0)
+ musepack_pid != 0)
{
debugLog("w1");
usleep(100000);
@@ -114,8 +110,8 @@
gdk_flush();
working = false;
- show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numFlacOk + numWavpackOk + numMonkeyOk + numMusepackOk + numAacOk,
- numCdparanoiaFailed + numLameFailed + numOggFailed + numFlacFailed + numWavpackFailed + numMonkeyFailed + numMusepackFailed + numAacFailed);
+ show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numFlacOk + numWavpackOk + numMonkeyOk + numMusepackOk ,
+ numCdparanoiaFailed + numLameFailed + numOggFailed + numFlacFailed + numWavpackFailed + numMonkeyFailed + numMusepackFailed );
}
// spawn needed threads and begin ripping
@@ -134,7 +130,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;
@@ -161,7 +156,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_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 @@
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_monkey);
-
- free(filename);
- }
}
free(albumdir);
@@ -313,7 +300,6 @@
numWavpackFailed = 0;
numMonkeyFailed = 0;
numMusepackFailed = 0;
- numAacFailed = 0;
numCdparanoiaOk = 0;
numLameOk = 0;
@@ -322,7 +308,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);
@@ -461,7 +446,6 @@
char* wavpackfilename2 = NULL;
char* monkeyfilename = NULL;
char* musepackfilename = NULL;
- char* aacfilename = NULL;
struct stat statStruct;
bool doEncode;
@@ -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);
}
}
- if (global_prefs->rip_aac)
- {
- debugLog("Encoding track %d to \"%s\"\n", tracknum, aacfilename);
-
- if (aborted) g_thread_exit(NULL);
-
- 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(wavfilename, aacfilename,
- global_prefs->aac_quality,
- &aac_percent);
- }
-
- if (aborted) g_thread_exit(NULL);
-
- 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);
- }
- }
if (!global_prefs->rip_wav)
{
debugLog("Removing track %d WAV file\n", tracknum);
@@ -806,7 +754,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;
monkey_percent = 0.0;
musepack_percent = 0.0;
- aac_percent = 0.0;
encode_tracks_completed++;
}
@@ -843,8 +789,6 @@
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;