Ticket #3233: mythplugins-0.21-nolame.patch
File mythplugins-0.21-nolame.patch, 7.5 KB (added by , 16 years ago) |
---|
-
configure
32 32 fftw_lib3="yes" 33 33 sdl="yes" 34 34 aac="no" # compile fails w/libfaad v2.0 35 mp3lame="yes" 35 36 exif="yes" 36 37 newexif="yes" 37 38 festival="no" # no config detection/setup routine … … 92 93 --enable-fftw enable fftw visualizers [$fftw_lib] 93 94 --enable-sdl use SDL for the synaesthesia output [$sdl] 94 95 --enable-aac enable AAC/MP4 audio file decompression [$aac] 96 --enable-libmp3lame enable MP3 encoding support using LAME [$mp3lame] 95 97 96 98 MythNews related options: 97 99 --enable-mythnews build the mythnews plugin [$news] … … 239 241 ;; 240 242 --disable-aac) aac="no" 241 243 ;; 244 --enable-libmp3lame) mp3lame="yes" 245 ;; 246 --disable-libmp3lame) mp3lame="no" 247 ;; 242 248 --enable-exif) exif="yes" 243 249 ;; 244 250 --enable-new-exif) newexif="yes" … … 269 275 visual="yes"; 270 276 fftw_lib="yes"; 271 277 aac="yes"; 278 mp3lame="yes"; 272 279 exif="yes"; 273 280 festival="yes"; 274 281 archive="yes"; … … 293 300 visual="no"; 294 301 fftw_lib="no"; 295 302 aac="no"; 303 mp3lame="no"; 296 304 exif="no"; 297 305 festival="no"; 298 306 archive="no"; … … 477 485 echo "MythMusic requires CDDA Paranoia." 478 486 fi 479 487 480 mp3lame="no"481 if has_header lame/lame.h && has_library libmp3lame ; then482 mp3lame="yes"483 else484 echo "MythMusic requires the LAME mp3 encoder."488 if test "$mp3lame" != "no" ; then 489 mp3lame="no" 490 if has_header lame/lame.h && has_library libmp3lame ; then 491 mp3lame="yes" 492 fi 485 493 fi 486 494 487 495 taglib="no" … … 498 506 fi 499 507 fi 500 508 501 if test "$mad" = "no" -o "$vorbis" = "no" -o "$flac" = "no" -o "$ mp3lame" = "no" -o "$taglib" = "no" -o "$cdlibs" = "no" ; then509 if test "$mad" = "no" -o "$vorbis" = "no" -o "$flac" = "no" -o "$taglib" = "no" -o "$cdlibs" = "no" ; then 502 510 echo "Disabling MythMusic due to missing dependencies." 503 511 music="no" 504 512 fi … … 802 810 if test "$exif" = "no" ; then 803 811 echo " EXIF support will not be included in MythGallery" 804 812 fi 813 814 if test "$mp3lame" = "yes" ; then 815 echo " MP3 encoding support will be included in MythMusic" 816 echo "#define LAME 1" >> ./mythmusic/mythmusic/config.h 817 echo "LIBS += -lmp3lame" >> ./mythmusic/mythmusic/config.pro 818 echo "HEADERS += lameencoder.h" >> ./mythmusic/mythmusic/config.pro 819 echo "SOURCES += lameencoder.cpp" >> ./mythmusic/mythmusic/config.pro 820 fi 821 822 if test "$mp3lame" = "no" ; then 823 echo " MP3 encoding support will not be included in MythMusic" 824 fi 805 825 fi 806 826 807 827 ########################################################### -
mythmusic/mythmusic/mythmusic.pro
20 20 21 21 INSTALLS += installfiles uifiles 22 22 23 LIBS += -lmad -ltag -logg -lvorbisfile -lvorbis -lvorbisenc -lFLAC -lmp3lame23 LIBS += -lmad -ltag -logg -lvorbisfile -lvorbis -lvorbisenc -lFLAC 24 24 25 25 cdaudio: LIBS += -lcdaudio 26 26 paranoia:LIBS += -lcdda_paranoia -lcdda_interface … … 31 31 HEADERS += metadata.h playbackbox.h playlist.h polygon.h 32 32 HEADERS += streaminput.h synaesthesia.h encoder.h visualize.h avfdecoder.h 33 33 HEADERS += treecheckitem.h vorbisdecoder.h vorbisencoder.h polygon.h 34 HEADERS += bumpscope.h globalsettings.h lameencoder.hdbcheck.h34 HEADERS += bumpscope.h globalsettings.h dbcheck.h 35 35 HEADERS += metaio.h metaiotaglib.h vcedit.h metaiooggvorbiscomment.h 36 36 HEADERS += metaioflacvorbiscomment.h metaioavfcomment.h 37 37 HEADERS += goom/filters.h goom/goomconfig.h goom/goom_core.h goom/graphic.h … … 45 45 SOURCES += flacdecoder.cpp flacencoder.cpp maddecoder.cpp main.cpp 46 46 SOURCES += mainvisual.cpp metadata.cpp playbackbox.cpp playlist.cpp 47 47 SOURCES += streaminput.cpp encoder.cpp dbcheck.cpp 48 SOURCES += synaesthesia.cpp treecheckitem.cpp vorbisdecoder.cpp lameencoder.cpp48 SOURCES += synaesthesia.cpp treecheckitem.cpp vorbisdecoder.cpp 49 49 SOURCES += vorbisencoder.cpp visualize.cpp bumpscope.cpp globalsettings.cpp 50 50 SOURCES += databasebox.cpp genres.cpp 51 51 SOURCES += metaio.cpp metaiotaglib.cpp vcedit.c metaiooggvorbiscomment.cpp -
mythmusic/mythmusic/globalsettings.cpp
20 20 21 21 // mythmusic 22 22 #include "globalsettings.h" 23 #include "config.h" 23 24 #include "mainvisual.h" 24 25 25 26 // General Settings … … 174 175 HostComboBox *gc = new HostComboBox("EncoderType"); 175 176 gc->setLabel(QObject::tr("Encoding")); 176 177 gc->addSelection(QObject::tr("Ogg Vorbis"), "ogg"); 178 #ifdef LAME 177 179 gc->addSelection(QObject::tr("Lame (MP3)"), "mp3"); 180 #endif 178 181 gc->setHelpText(QObject::tr("Audio encoder to use for CD ripping. " 179 182 "Note that the quality level 'Perfect' will use the " 180 183 "FLAC encoder.")); … … 193 196 return gc; 194 197 }; 195 198 199 #ifdef LAME 196 200 static HostCheckBox *Mp3UseVBR() 197 201 { 198 202 HostCheckBox *gc = new HostCheckBox("Mp3UseVBR"); … … 203 207 "The Ogg encoder will always use variable bitrates.")); 204 208 return gc; 205 209 }; 210 #endif 206 211 207 212 static HostLineEdit *FilenameTemplate() 208 213 { … … 696 701 encodersettings->setLabel(QObject::tr("CD Ripper Settings (part 2)")); 697 702 encodersettings->addChild(EncoderType()); 698 703 encodersettings->addChild(DefaultRipQuality()); 704 #ifdef LAME 699 705 encodersettings->addChild(Mp3UseVBR()); 706 #endif 700 707 addChild(encodersettings); 701 708 } 702 709 -
mythmusic/mythmusic/cdrip.cpp
37 37 #include <mythtv/mythmediamonitor.h> 38 38 39 39 // MythMusic includes 40 #include "config.h" 40 41 #include "cdrip.h" 41 42 #include "cddecoder.h" 42 43 #include "encoder.h" 43 44 #include "vorbisencoder.h" 45 #ifdef LAME 44 46 #include "lameencoder.h" 47 #endif 45 48 #include "flacencoder.h" 46 49 #include "genres.h" 47 50 #include "editmetadata.h" … … 172 175 173 176 QString textstatus; 174 177 QString encodertype = gContext->GetSetting("EncoderType"); 178 #ifdef LAME 175 179 bool mp3usevbr = gContext->GetNumSetting("Mp3UseVBR", 0); 180 #endif 176 181 177 182 m_totalSectors = 0; 178 183 m_totalSectorsDone = 0; … … 228 233 229 234 if (m_quality < 3) 230 235 { 236 #ifdef LAME 231 237 if (encodertype == "mp3") 232 238 { 233 239 outfile += ".mp3"; … … 235 241 titleTrack, mp3usevbr)); 236 242 } 237 243 else // ogg 244 #endif 238 245 { 239 246 outfile += ".ogg"; 240 247 encoder.reset(new VorbisEncoder(outfile, m_quality, -
settings.pro
59 59 } 60 60 QMAKE_LIBDIR_X11 = 61 61 62 EXTRA_LIBS = -lfreetype -lmp3lame62 EXTRA_LIBS = -lfreetype 63 63 EXTRA_LIBS += $$CONFIG_AUDIO_ALSA_LIBS 64 64 EXTRA_LIBS += $$CONFIG_AUDIO_ARTS_LIBS 65 65 EXTRA_LIBS += $$CONFIG_AUDIO_JACK_LIBS