[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-devel
Subject:    Patch: audiocd ogg encoding bitrate & configurable liblame dir
From:       Christoph Bartoschek <bartoschek () gmx ! de>
Date:       2002-09-02 20:00:15
[Download RAW message or body]

Hi,

here are two patches:

1. in kdemultimedia you can make configure --with-lame=LAMEDIR. This compiles 
the audiocd ioslave with mp3 encoding support. However the ioslave does not 
look for liblame in LAMEDIR. This is corrected by a new define for the 
correct directory. You should consider to place LAME_LIBDIR as the first 
scanned directory. This is the directory the user want's audiocd to use.

2. The bitrate settings for ogg vorbis are not considered currently, because 
kcmaudiocd does not set the correct value for encmethod. One should redesign 
the current dialog to switch between bitrate and quality encoding. But this 
bugfix lets audiocd use the bitrate values if one of the checkboxes is 
checked.

Christoph
["patch-audiocd-lamelib.diff" (text/x-diff)]

diff -r -u3 kdemultimedia/kioslave/audiocd/audiocd.cpp \
                kdemultimedia.new/kioslave/audiocd/audiocd.cpp
--- kdemultimedia/kioslave/audiocd/audiocd.cpp	Mon Sep  2 21:32:04 2002
+++ kdemultimedia.new/kioslave/audiocd/audiocd.cpp	Mon Sep  2 21:14:48 2002
@@ -439,6 +439,9 @@
 #else
    libpaths << "/usr/lib/"
             << "/usr/local/lib/"
+#ifdef LAME_LIBDIR
+	    << LAME_LIBDIR
+#endif
             << "";
  
    libnames << "libmp3lame.so.0"
diff -r -u3 kdemultimedia/kioslave/audiocd/configure.in.in \
                kdemultimedia.new/kioslave/audiocd/configure.in.in
--- kdemultimedia/kioslave/audiocd/configure.in.in	Mon Sep  2 21:32:58 2002
+++ kdemultimedia.new/kioslave/audiocd/configure.in.in	Mon Sep  2 21:31:36 2002
@@ -187,6 +187,7 @@
   if test "$non_compile" = no ; then
     AC_MSG_RESULT($msg)
     AC_DEFINE_UNQUOTED(HAVE_LAME, 1, [Define if you have lame])
+    AC_DEFINE_UNQUOTED(LAME_LIBDIR, "${LAME_ROOT}/lib/" , [Define dir of limelib])
     KCM_AUDIOCD="kcmaudiocd"
   else
     AC_MSG_RESULT(no (but first try gave $msg))


["patch-ogg-bitrate.diff" (text/x-diff)]

diff -r -u3 kdemultimedia/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp \
                kdemultimedia.new/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp
--- kdemultimedia/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp	Mon Sep  2 21:32:59 2002
+++ kdemultimedia.new/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp	Mon Sep  2 21:31:54 \
2002 @@ -308,6 +308,10 @@
   int vorbis_nominal_bitrate = vorbis_nominal_br->currentItem();
   vorbis_nominal_bitrate = vorbis_nominal_bitrates[vorbis_nominal_bitrate];
 
+  int vorbis_encmethod = 0;
+  if (set_vorbis_min_br->isChecked() || set_vorbis_max_br->isChecked() || 
+  	set_vorbis_nominal_br->isChecked()) vorbis_encmethod = 1;
+
   config->setGroup("CDDA");
   config->writeEntry("autosearch",cd_autosearch_check->isChecked());
   config->writeEntry("device",cd_device_string->text());
@@ -357,6 +361,7 @@
 
   config->setGroup("Vorbis");
 
+  config->writeEntry("encmethod", vorbis_encmethod);
   config->writeEntry("set_vorbis_min_bitrate",set_vorbis_min_br->isChecked());
   config->writeEntry("set_vorbis_max_bitrate",set_vorbis_max_br->isChecked());
   config->writeEntry("set_vorbis_nominal_bitrate",set_vorbis_nominal_br->isChecked());



>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<

[prev in list] [next in list] [prev in thread] [next in thread]