And of course, i forgot the attach :-P
On Friday 05 December 2008 15:05:28 Helio Chissini de Castro wrote:
> On Sexta 05 Dezembro 2008, you wrote:
> > I remember trying to find out about CMake back when Albert originally
> > brought up the idea of using a new build tool...
> >
> > There are areas were I see SCons as lacking, though speed is not one of
> > them (it's a little slow on my Atom netbook, but it flies on a real
> > machine)...
> >
> > I'd be interested in CMake, if it:
> > * is able to do cross compiling (build i386 Linux, Windows, OSX from our
> > 64-bit Linux server) or supports some kind of distributed build set-up to
> > do this where builds can be built and uploaded from mulitple machines to
> > a server with results.
>
> As KDE developer and a distro developer the answer is a BIG yes.
>
> > * solves some packaging problems (can make .rpm, .deb, .dmg, .msi)
>
> CPack is more or less functional. They propose to generate all kind of
> native packages
>
> > * makes it easier to support autobuilds (nightly snaps or when the repo
> > changes)
>
> Not sure if i understood this one, but due the text nature of CMakeFiles,
> and their multiplatform flexibility, any rebuild trigger will run automatic
> just the changed part of cmake. The good part is that out of the source
> build dir is the usual rule, so would be easy simply clean the build dir
> without affect source.
>
> > * creates projects that can be used from within Eclipse CDT
>
> Little more than this :-)
> http://cmake.org/cmake/help/cmake2.6docs.html#section_Generators
>
> > * easily extends to handle new build flags and library/header deps
>
> Again, text file in a very intuitive simple shell like scripts. We can just
> change one test without affect whole build and done.
>
> Most of all, is not intrusive. So we can drop now and test it without
> affect the current buildsystem
--
Helio Chissini de Castro
KDE Project
Brasil and South America Primary Contact
diff -r -N -u -x '*.pyc' -x '*.o' -x build -x cache -x '*~' -x config.log mixxx-1.6.1/cmake/modules/FindAlsa.cmake mixxx-1.6.1-cmake/cmake/modules/FindAlsa.cmake
--- mixxx-1.6.1/cmake/modules/FindAlsa.cmake 1969-12-31 21:00:00.000000000 -0300
+++ mixxx-1.6.1-cmake/cmake/modules/FindAlsa.cmake 2008-10-21 23:27:52.000000000 -0200
@@ -0,0 +1,69 @@
+# Alsa check, based on libkmid/configure.in.in.
+# Only the support for Alsa >= 0.9.x was included; 0.5.x was dropped (but feel free to re-add it if you need it)
+# It defines ...
+# It offers the following macros:
+# ALSA_CONFIGURE_FILE(config_header) - generate a config.h, typical usage:
+# ALSA_CONFIGURE_FILE(${CMAKE_BINARY_DIR}/config-alsa.h)
+# ALSA_VERSION_STRING(version_string) looks for alsa/version.h and reads the version string into
+# the first argument passed to the macro
+
+# Copyright (c) 2006, David Faure, <[EMAIL PROTECTED]>
+# Copyright (c) 2007, Matthias Kretz <[EMAIL PROTECTED]>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+include(CheckIncludeFiles)
+include(CheckIncludeFileCXX)
+include(CheckLibraryExists)
+
+# Already done by toplevel
+find_library(ASOUND_LIBRARY asound)
+set(ASOUND_LIBRARY_DIR "")
+if(ASOUND_LIBRARY)
+ get_filename_component(ASOUND_LIBRARY_DIR ${ASOUND_LIBRARY} PATH)
+endif(ASOUND_LIBRARY)
+
+check_library_exists(asound snd_seq_create_simple_port "${ASOUND_LIBRARY_DIR}" HAVE_LIBASOUND2)
+if(HAVE_LIBASOUND2)
+ message(STATUS "Found ALSA: ${ASOUND_LIBRARY}")
+else(HAVE_LIBASOUND2)
+ message(STATUS "ALSA not found")
+endif(HAVE_LIBASOUND2)
+set(ALSA_FOUND ${HAVE_LIBASOUND2})
+
+find_path(ALSA_INCLUDES alsa/version.h)
+
+macro(ALSA_VERSION_STRING _result)
+ # check for version in alsa/version.h
+ if(ALSA_INCLUDES)
+ file(READ "${ALSA_INCLUDES}/alsa/version.h" _ALSA_VERSION_CONTENT)
+ string(REGEX REPLACE ".*SND_LIB_VERSION_STR.*\"(.*)\".*" "\\1" ${_result} ${_ALSA_VERSION_CONTENT})
+ else(ALSA_INCLUDES)
+ message(STATUS "ALSA version not known. ALSA output will probably not work correctly.")
+ endif(ALSA_INCLUDES)
+endmacro(ALSA_VERSION_STRING _result)
+
+
+get_filename_component(_FIND_ALSA_MODULE_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
+macro(ALSA_CONFIGURE_FILE _destFile)
+ check_include_files(sys/soundcard.h HAVE_SYS_SOUNDCARD_H)
+ check_include_files(machine/soundcard.h HAVE_MACHINE_SOUNDCARD_H)
+
+ check_include_files(linux/awe_voice.h HAVE_LINUX_AWE_VOICE_H)
+ check_include_files(awe_voice.h HAVE_AWE_VOICE_H)
+ check_include_files(/usr/src/sys/i386/isa/sound/awe_voice.h HAVE__USR_SRC_SYS_I386_ISA_SOUND_AWE_VOICE_H)
+ check_include_files(/usr/src/sys/gnu/i386/isa/sound/awe_voice.h HAVE__USR_SRC_SYS_GNU_I386_ISA_SOUND_AWE_VOICE_H)
+
+ check_include_file_cxx(sys/asoundlib.h HAVE_SYS_ASOUNDLIB_H)
+ check_include_file_cxx(alsa/asoundlib.h HAVE_ALSA_ASOUNDLIB_H)
+
+ check_library_exists(asound snd_pcm_resume "${ASOUND_LIBRARY_DIR}" ASOUND_HAS_SND_PCM_RESUME)
+ if(ASOUND_HAS_SND_PCM_RESUME)
+ set(HAVE_SND_PCM_RESUME 1)
+ endif(ASOUND_HAS_SND_PCM_RESUME)
+
+ configure_file(${_FIND_ALSA_MODULE_DIR}/config-alsa.h.cmake ${_destFile})
+endmacro(ALSA_CONFIGURE_FILE _destFile)
+
+mark_as_advanced(ALSA_INCLUDES ASOUND_LIBRARY)
diff -r -N -u -x '*.pyc' -x '*.o' -x build -x cache -x '*~' -x config.log mixxx-1.6.1/cmake/modules/FindFFmpeg.cmake mixxx-1.6.1-cmake/cmake/modules/FindFFmpeg.cmake
--- mixxx-1.6.1/cmake/modules/FindFFmpeg.cmake 1969-12-31 21:00:00.000000000 -0300
+++ mixxx-1.6.1-cmake/cmake/modules/FindFFmpeg.cmake 2008-10-22 15:15:04.000000000 -0200
@@ -0,0 +1,81 @@
+# - Try to find ffmpeg
+# Once done this will define
+#
+# FFMPEG_FOUND - system has ffmpeg
+# FFMPEG_LIBRARIES - Link these to use ffmpeg
+# FFMPGEG_CFLAGS - Compiler switches required for using ffmpeg
+
+if (FFMPEG_LIBRARIES)
+ # in cache already
+ set(FFMPEG_FOUND TRUE)
+else (FFMPEG_LIBRARIES)
+ set(FFMPEG_FOUND FALSE)
+ if (NOT WIN32)
+ PKG_CHECK_MODULES(AVCODEC REQUIRED libavcodec)
+ PKG_CHECK_MODULES(AVDEVICE REQUIRED libavdevice)
+ PKG_CHECK_MODULES(AVFORMAT REQUIRED libavformat)
+ PKG_CHECK_MODULES(AVUTIL REQUIRED libavutil)
+
+ set(FFMPEG_FOUND TRUE)
+
+ PKG_CHECK_MODULES(POSTPROC libpostproc)
+ PKG_CHECK_MODULES(SWSCALE libswscale)
+ endif (NOT WIN32)
+
+ set(FFMPEG_LIBRARIES)
+ set(FFMPGEG_CFLAGS)
+
+ if(AVCODEC_FOUND)
+ set(FFMPEG_LIBRARIES ${AVCODEC_LIBRARIES} ${FFMPEG_LIBRARIES})
+ set(FFMPGEG_CFLAGS ${AVCODEC_CFLAGS} ${FFMPGEG_CFLAGS} )
+ set(FFMPEG_INCLUDE_DIR ${AVCODEC_INCLUDEDIR} ${FFMPEG_INCLUDEDIR})
+ endif (AVCODEC_FOUND)
+
+ if(AVDEVICE_FOUND)
+ set(FFMPEG_LIBRARIES ${AVDEVICE_LIBRARIES} ${FFMPEG_LIBRARIES})
+ set(FFMPGEG_CFLAGS ${AVDEVICE_CFLAGS} ${FFMPGEG_CFLAGS} )
+ set(FFMPEG_INCLUDE_DIR ${AVDEVICE_INCLUDEDIR} ${FFMPEG_INCLUDEDIR})
+ endif (AVDEVICE_FOUND)
+
+ if(AVFORMAT_FOUND)
+ set(FFMPEG_LIBRARIES ${AVFORMAT_LIBRARIES} ${FFMPEG_LIBRARIES})
+ set(FFMPGEG_CFLAGS ${AVFORMAT_CFLAGS} ${FFMPGEG_CFLAGS} )
+ set(FFMPEG_INCLUDE_DIR ${AVFORMAT_INCLUDEDIR} ${FFMPEG_INCLUDEDIR})
+ endif (AVFORMAT_FOUND)
+
+ if(AVUTIL_FOUND)
+ set(FFMPEG_LIBRARIES ${AVUTIL_LIBRARIES} ${FFMPEG_LIBRARIES})
+ set(FFMPGEG_CFLAGS ${AVUTIL_CFLAGS} ${FFMPGEG_CFLAGS} )
+ set(FFMPEG_INCLUDE_DIR ${AVUTIL_INCLUDEDIR} ${FFMPEG_INCLUDEDIR})
+ endif (AVUTIL_FOUND)
+
+ if(POSTPROC_FOUND)
+ set(FFMPEG_LIBRARIES ${POSTPROC_LIBRARIES} ${FFMPEG_LIBRARIES})
+ set(FFMPGEG_CFLAGS ${POSTPROC_CFLAGS} ${FFMPGEG_CFLAGS} )
+ set(FFMPEG_INCLUDE_DIR ${POSTPROC_INCLUDEDIR} ${FFMPEG_INCLUDEDIR})
+ endif (POSTPROC_FOUND)
+
+ if(SWSCALE_FOUND)
+ set(FFMPEG_LIBRARIES ${SWSCALE_LIBRARIES} ${FFMPEG_LIBRARIES})
+ set(FFMPGEG_CFLAGS ${SWSCALE_CFLAGS} ${FFMPGEG_CFLAGS} )
+ set(FFMPEG_INCLUDE_DIR ${SWSCALE_INCLUDEDIR} ${FFMPEG_INCLUDEDIR})
+ endif (SWSCALE_FOUND)
+
+ if (FFMPEG_LIBRARIES AND FFMPEG_INCLUDE_DIR)
+ set(FFMPEG_FOUND TRUE)
+ endif (FFMPEG_LIBRARIES AND FFMPEG_INCLUDE_DIR)
+
+ if (FFMPEG_FOUND)
+ message(STATUS "Found FFMPEG: ${FFMPEG_LIBRARIES}")
+ else (FFMPEG_FOUND)
+ if (FFmpeg_FIND_REQUIRED)
+ message(FATAL_ERROR "Could NOT find FFMPEG")
+ else (FFmpeg_FIND_REQUIRED)
+ message(STATUS "Could NOT find FFMPEG")
+ endif (FFmpeg_FIND_REQUIRED)
+ endif (FFMPEG_FOUND)
+
+ mark_as_advanced( FFMPEG_LIBRARIES
+ FFMPEG_INCLUDE_DIR
+ FFMPEG_CFLAGS )
+endif (FFMPEG_LIBRARIES)
diff -r -N -u -x '*.pyc' -x '*.o' -x build -x cache -x '*~' -x config.log mixxx-1.6.1/cmake/modules/FindLadspa.cmake mixxx-1.6.1-cmake/cmake/modules/FindLadspa.cmake
--- mixxx-1.6.1/cmake/modules/FindLadspa.cmake 1969-12-31 21:00:00.000000000 -0300
+++ mixxx-1.6.1-cmake/cmake/modules/FindLadspa.cmake 2008-10-21 22:01:29.000000000 -0200
@@ -0,0 +1,17 @@
+# LADSPA_FOUND - system has ladspa
+# LADSPA_INCLUDE_DIR - the ladspa header
+
+IF (UNIX)
+
+ FIND_PATH(LADSPA_INCLUDE_DIR ladspa.h
+ /usr/include
+ /usr/local/include )
+
+ENDIF (UNIX)
+
+SET (LADSPA_FOUND "NO")
+
+IF(LADSPA_INCLUDE_DIR)
+ SET( LADSPA_FOUND "YES" )
+ENDIF(LADSPA_INCLUDE_DIR)
+
diff -r -N -u -x '*.pyc' -x '*.o' -x build -x cache -x '*~' -x config.log mixxx-1.6.1/cmake/modules/FindOggVorbis.cmake mixxx-1.6.1-cmake/cmake/modules/FindOggVorbis.cmake
--- mixxx-1.6.1/cmake/modules/FindOggVorbis.cmake 1969-12-31 21:00:00.000000000 -0300
+++ mixxx-1.6.1-cmake/cmake/modules/FindOggVorbis.cmake 2008-10-21 21:26:40.000000000 -0200
@@ -0,0 +1,86 @@
+# - Try to find the OggVorbis libraries
+# Once done this will define
+#
+# OGGVORBIS_FOUND - system has OggVorbis
+# OGGVORBIS_VERSION - set either to 1 or 2
+# OGGVORBIS_INCLUDE_DIR - the OggVorbis include directory
+# OGGVORBIS_LIBRARIES - The libraries needed to use OggVorbis
+# OGG_LIBRARY - The Ogg library
+# VORBIS_LIBRARY - The Vorbis library
+# VORBISFILE_LIBRARY - The VorbisFile library
+# VORBISENC_LIBRARY - The VorbisEnc library
+
+# Copyright (c) 2006, Richard Laerkaeng, <[EMAIL PROTECTED]>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+
+include (CheckLibraryExists)
+
+find_path(VORBIS_INCLUDE_DIR vorbis/vorbisfile.h)
+find_path(OGG_INCLUDE_DIR ogg/ogg.h)
+
+find_library(OGG_LIBRARY NAMES ogg)
+find_library(VORBIS_LIBRARY NAMES vorbis)
+find_library(VORBISFILE_LIBRARY NAMES vorbisfile)
+find_library(VORBISENC_LIBRARY NAMES vorbisenc)
+
+
+if (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY AND VORBISENC_LIBRARY)
+ set(OGGVORBIS_FOUND TRUE)
+
+ set(OGGVORBIS_LIBRARIES ${OGG_LIBRARY} ${VORBIS_LIBRARY} ${VORBISFILE_LIBRARY} ${VORBISENC_LIBRARY})
+
+ set(_CMAKE_REQUIRED_LIBRARIES_TMP ${CMAKE_REQUIRED_LIBRARIES})
+ set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${OGGVORBIS_LIBRARIES})
+ check_library_exists(vorbis vorbis_bitrate_addblock "" HAVE_LIBVORBISENC2)
+ set(CMAKE_REQUIRED_LIBRARIES ${_CMAKE_REQUIRED_LIBRARIES_TMP})
+
+ if (HAVE_LIBVORBISENC2)
+ set (OGGVORBIS_VERSION 2)
+ else (HAVE_LIBVORBISENC2)
+ set (OGGVORBIS_VERSION 1)
+ endif (HAVE_LIBVORBISENC2)
+
+else (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY AND VORBISENC_LIBRARY)
+ set (OGGVORBIS_VERSION)
+ set(OGGVORBIS_FOUND FALSE)
+endif (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY AND VORBISENC_LIBRARY)
+
+
+if (OGGVORBIS_FOUND)
+ if (NOT OggVorbis_FIND_QUIETLY)
+ message(STATUS "Found OggVorbis: ${OGGVORBIS_LIBRARIES}")
+ endif (NOT OggVorbis_FIND_QUIETLY)
+else (OGGVORBIS_FOUND)
+ if (OggVorbis_FIND_REQUIRED)
+ message(FATAL_ERROR "Could NOT find OggVorbis libraries")
+ endif (OggVorbis_FIND_REQUIRED)
+ if (NOT OggVorbis_FIND_QUITELY)
+ message(STATUS "Could NOT find OggVorbis libraries")
+ endif (NOT OggVorbis_FIND_QUITELY)
+endif (OGGVORBIS_FOUND)
+
+#check_include_files(vorbis/vorbisfile.h HAVE_VORBISFILE_H)
+#check_library_exists(ogg ogg_page_version "" HAVE_LIBOGG)
+#check_library_exists(vorbis vorbis_info_init "" HAVE_LIBVORBIS)
+#check_library_exists(vorbisfile ov_open "" HAVE_LIBVORBISFILE)
+#check_library_exists(vorbisenc vorbis_info_clear "" HAVE_LIBVORBISENC)
+#check_library_exists(vorbis vorbis_bitrate_addblock "" HAVE_LIBVORBISENC2)
+
+#if (HAVE_LIBOGG AND HAVE_VORBISFILE_H AND HAVE_LIBVORBIS AND HAVE_LIBVORBISFILE AND HAVE_LIBVORBISENC)
+# message(STATUS "Ogg/Vorbis found")
+# set (VORBIS_LIBS "-lvorbis -logg")
+# set (VORBISFILE_LIBS "-lvorbisfile")
+# set (VORBISENC_LIBS "-lvorbisenc")
+# set (OGGVORBIS_FOUND TRUE)
+# if (HAVE_LIBVORBISENC2)
+# set (HAVE_VORBIS 2)
+# else (HAVE_LIBVORBISENC2)
+# set (HAVE_VORBIS 1)
+# endif (HAVE_LIBVORBISENC2)
+#else (HAVE_LIBOGG AND HAVE_VORBISFILE_H AND HAVE_LIBVORBIS AND HAVE_LIBVORBISFILE AND HAVE_LIBVORBISENC)
+# message(STATUS "Ogg/Vorbis not found")
+#endif (HAVE_LIBOGG AND HAVE_VORBISFILE_H AND HAVE_LIBVORBIS AND HAVE_LIBVORBISFILE AND HAVE_LIBVORBISENC)
+
diff -r -N -u -x '*.pyc' -x '*.o' -x build -x cache -x '*~' -x config.log mixxx-1.6.1/CMakeLists.txt mixxx-1.6.1-cmake/CMakeLists.txt
--- mixxx-1.6.1/CMakeLists.txt 1969-12-31 21:00:00.000000000 -0300
+++ mixxx-1.6.1-cmake/CMakeLists.txt 2008-10-22 15:57:18.000000000 -0200
@@ -0,0 +1,130 @@
+PROJECT(Mixxx)
+
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
+
+SET(CMAKE_COLOR_MAKEFILE ON)
+SET(CMAKE_VERBOSE_MAKEFILE OFF)
+SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
+
+CMAKE_POLICY(SET CMP0005 NEW)
+CMAKE_POLICY(SET CMP0003 OLD)
+
+SET(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
+INCLUDE(CheckTypeSize)
+ADD_DEFINITIONS( -fPIC -DPIC -D_DEBUG )
+CHECK_TYPE_SIZE( "void*" VOID_SIZE )
+IF( VOID_SIZE EQUAL 8 )
+ MESSAGE( STATUS "Compiling in 64 bits machine" )
+ENDIF( VOID_SIZE EQUAL 8 )
+SET(LIB_INSTALL_DIR "lib${LIB_SUFFIX}")
+
+FIND_PACKAGE(Qt4 REQUIRED)
+FIND_PACKAGE(OpenGL REQUIRED)
+FIND_PACKAGE(PkgConfig REQUIRED)
+
+# Ladspa
+FIND_PACKAGE(Ladspa)
+IF(LADSPA_FOUND)
+ ADD_DEFINITIONS(-D__LADSPA__)
+ MESSAGE("LADSPA support... enabled")
+ENDIF(LADSPA_FOUND)
+
+# Shoutcast, Vorbis, Speex
+FIND_PACKAGE(OggVorbis REQUIRED)
+PKG_CHECK_MODULES(SHOUT shout)
+IF( SHOUT_FOUND )
+ ADD_DEFINITIONS(-D__SHOUTCAST__ ${SHOUT_CFLAGS})
+ INCLUDE_DIRECTORIES(${SHOUT_INCLUDEDIR})
+ LINK_DIRECTORIES(${SHOUT_LIBRARY_DIRS})
+ MESSAGE("Shoutcast support... enabled")
+ENDIF( SHOUT_FOUND )
+PKG_CHECK_MODULES(SPEEX speex)
+IF( SPEEX_FOUND )
+ ADD_DEFINITIONS(${SPEEX_CFLAGS})
+ INCLUDE_DIRECTORIES(${SPEEX_INCLUDEDIR})
+ LINK_DIRECTORIES(${SPEEX_LIBRARY_DIRS})
+ENDIF( SPEEX_FOUND )
+
+
+# DJCONSOLE
+PKG_CHECK_MODULES(DJCONSOLE libdjconsole)
+IF( DJCONSOLE_FOUND )
+ ADD_DEFINITIONS(-D__LIBDJCONSOLE__ ${DJCONSOLE_CFLAGS})
+ INCLUDE_DIRECTORIES(${DJCONSOLE_INCLUDEDIR} )
+ LINK_DIRECTORIES(${DJCONSOLE_LIBRARY_DIRS})
+ENDIF( DJCONSOLE_FOUND )
+
+# PORTAUDIO
+PKG_CHECK_MODULES(PORTAUDIO REQUIRED portaudio-2.0)
+IF( PORTAUDIO_FOUND )
+ ADD_DEFINITIONS(-D__PORTAUDIO__ ${PORTAUDIO_CFLAGS})
+ INCLUDE_DIRECTORIES(${PORTAUDIO_INCLUDEDIR} )
+ LINK_DIRECTORIES(${PORTAUDIO_LIBRARY_DIRS})
+ENDIF( PORTAUDIO_FOUND )
+
+# ID3TAG
+PKG_CHECK_MODULES(ID3TAG REQUIRED id3tag)
+IF( ID3TAG_FOUND )
+ ADD_DEFINITIONS(${ID3TAG_CFLAGS})
+ INCLUDE_DIRECTORIES(${ID3TAG_INCLUDEDIR} )
+ LINK_DIRECTORIES(${ID3TAG_LIBRARY_DIRS})
+ENDIF( ID3TAG_FOUND )
+
+# ALSA
+FIND_PACKAGE(Alsa REQUIRED)
+
+
+# GPOD
+PKG_CHECK_MODULES(GPOD libgpod-1.0)
+IF( GPOD_FOUND )
+ ADD_DEFINITIONS(-D__IPOD__ ${GPOD_CFLAGS})
+ INCLUDE_DIRECTORIES(${GPOD_INCLUDEDIR} )
+ LINK_DIRECTORIES(${GPOD_LIBRARY_DIRS})
+ MESSAGE("iPod support... enabled")
+ENDIF( GPOD_FOUND )
+
+# SAMPLERATE
+PKG_CHECK_MODULES(SAMPLERATE samplerate)
+IF( SAMPLERATE_FOUND )
+ ADD_DEFINITIONS(${SAMPLERATE_CFLAGS})
+ INCLUDE_DIRECTORIES(${SAMPLERATE_INCLUDEDIR} )
+ LINK_DIRECTORIES(${SAMPLERATE_LIBRARY_DIRS})
+ENDIF( SAMPLERATE_FOUND )
+
+# SNDFILE
+PKG_CHECK_MODULES(SNDFILE sndfile)
+IF( SNDFILE_FOUND )
+ ADD_DEFINITIONS(-D__SNDFILE__ ${SNDFILE_CFLAGS})
+ INCLUDE_DIRECTORIES(${SNDFILE_INCLUDEDIR} )
+ LINK_DIRECTORIES(${SNDFILE_LIBRARY_DIRS})
+ENDIF( SNDFILE_FOUND )
+
+# FFMPEG
+FIND_PACKAGE(FFmpeg)
+IF(FFMPEG_FOUND)
+ ADD_DEFINITIONS(-D__FFMPEGFILE__ ${FFMPEG_CFLAGS})
+ INCLUDE_DIRECTORIES(${FFMPEG_INCLUDEDIR})
+ENDIF(FFMPEG_FOUND)
+
+
+IF(WIN32)
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWIN32 -D__WIN__ -DUNICODE -D_WINDOWS" )
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWIN32 -D__WIN__ -DUNICODE -D_WINDOWS")
+ELSE(WIN32)
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -Wall -W -g -D_REENTRANT")
+ SET(CMAKE_LINK_FLAGS "${CMAKE_LINK_FLAGS} -pipe -Wall -W -g")
+ENDIF(WIN32)
+
+IF(UNIX)
+ ADD_DEFINITIONS(-D__UNIX__ -D__LINUX__
+ -DBPMSCHEME_FILE=".mixxxbpmscheme.xml"
+ -DSETTINGS_FILE=".mixxx.cfg"
+ -DTRACK_FILE=".mixxxtrack.xml"
+ -DUNIX_SHARE_PATH="/usr/share/mixxx")
+ENDIF(UNIX)
+
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/lib/soundtouch )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/lib/kissfft )
+
+ADD_SUBDIRECTORY(lib)
+ADD_SUBDIRECTORY(src)
diff -r -N -u -x '*.pyc' -x '*.o' -x build -x cache -x '*~' -x config.log mixxx-1.6.1/lib/CMakeLists.txt mixxx-1.6.1-cmake/lib/CMakeLists.txt
--- mixxx-1.6.1/lib/CMakeLists.txt 1969-12-31 21:00:00.000000000 -0300
+++ mixxx-1.6.1-cmake/lib/CMakeLists.txt 2008-10-22 00:36:56.000000000 -0200
@@ -0,0 +1,3 @@
+ADD_SUBDIRECTORY(soundtouch)
+ADD_SUBDIRECTORY(kissfft)
+ADD_SUBDIRECTORY(fidlib-0.9.9)
diff -r -N -u -x '*.pyc' -x '*.o' -x build -x cache -x '*~' -x config.log mixxx-1.6.1/lib/fidlib-0.9.9/CMakeLists.txt mixxx-1.6.1-cmake/lib/fidlib-0.9.9/CMakeLists.txt
--- mixxx-1.6.1/lib/fidlib-0.9.9/CMakeLists.txt 1969-12-31 21:00:00.000000000 -0300
+++ mixxx-1.6.1-cmake/lib/fidlib-0.9.9/CMakeLists.txt 2008-10-21 22:29:05.000000000 -0200
@@ -0,0 +1,18 @@
+INCLUDE_DIRECTORIES(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+SET(fidlib_SRCS
+ fidlib.c
+ )
+
+IF(UNIX OR APPLE)
+ ADD_DEFINITIONS("-DT_LINUX")
+ELSE(UNIX OR APPLE)
+ ADD_DEFINITIONS(-DT_MSVC)
+ SET(CMAKE_LINK_FLAGS '${CMAKE_LINK_FLAGS} /nodefaultlib:LIBCMT.lib /nodefaultlib:LIBCMTD.lib')
+ENDIF(UNIX OR APPLE)
+
+ADD_LIBRARY(fidlib STATIC ${fidlib_SRCS})
+
diff -r -N -u -x '*.pyc' -x '*.o' -x build -x cache -x '*~' -x config.log mixxx-1.6.1/lib/kissfft/CMakeLists.txt mixxx-1.6.1-cmake/lib/kissfft/CMakeLists.txt
--- mixxx-1.6.1/lib/kissfft/CMakeLists.txt 1969-12-31 21:00:00.000000000 -0300
+++ mixxx-1.6.1-cmake/lib/kissfft/CMakeLists.txt 2008-10-21 22:30:03.000000000 -0200
@@ -0,0 +1,8 @@
+INCLUDE_DIRECTORIES(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+SET(kiss_SRCS kiss_fft.c )
+
+ADD_LIBRARY(kissfft STATIC ${kiss_SRCS} )
diff -r -N -u -x '*.pyc' -x '*.o' -x build -x cache -x '*~' -x config.log mixxx-1.6.1/lib/soundtouch/CMakeLists.txt mixxx-1.6.1-cmake/lib/soundtouch/CMakeLists.txt
--- mixxx-1.6.1/lib/soundtouch/CMakeLists.txt 1969-12-31 21:00:00.000000000 -0300
+++ mixxx-1.6.1-cmake/lib/soundtouch/CMakeLists.txt 2008-10-21 21:08:15.000000000 -0200
@@ -0,0 +1,32 @@
+INCLUDE_DIRECTORIES(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+SET(soundtouch_SRCS
+ SoundTouch.cpp
+ TDStretch.cpp
+ RateTransposer.cpp
+ AAFilter.cpp
+ FIFOSampleBuffer.cpp
+ FIRFilter.cpp
+ )
+
+IF(WIN32)
+ SET(soundtouch_platform_SRCS
+ cpu_detect_x86_win.cpp
+ mmx_win.cpp
+ sse_win.cpp
+ now_win.cpp
+ )
+ELSE(WIN32)
+ SET(soundtouch_platform_SRCS
+ cpu_detect_x86_gcc.cpp
+ )
+ENDIF(WIN32)
+
+ADD_LIBRARY(soundtouch STATIC
+ ${soundtouch_SRCS}
+ ${soundtouch_platform_SRCS})
+
+
diff -r -N -u -x '*.pyc' -x '*.o' -x build -x cache -x '*~' -x config.log mixxx-1.6.1/.mixxx_flags.svn mixxx-1.6.1-cmake/.mixxx_flags.svn
--- mixxx-1.6.1/.mixxx_flags.svn 1969-12-31 21:00:00.000000000 -0300
+++ mixxx-1.6.1-cmake/.mixxx_flags.svn 2008-10-21 18:16:31.000000000 -0200
@@ -0,0 +1 @@
+#define BUILD_FLAGS "hifieq vinylcontrol optimize=1 "
diff -r -N -u -x '*.pyc' -x '*.o' -x build -x cache -x '*~' -x config.log mixxx-1.6.1/.mixxx_version.svn mixxx-1.6.1-cmake/.mixxx_version.svn
--- mixxx-1.6.1/.mixxx_version.svn 1969-12-31 21:00:00.000000000 -0300
+++ mixxx-1.6.1-cmake/.mixxx_version.svn 2008-10-21 18:16:25.000000000 -0200
@@ -0,0 +1 @@
+#define BUILD_REV ""
diff -r -N -u -x '*.pyc' -x '*.o' -x build -x cache -x '*~' -x config.log mixxx-1.6.1/src/CMakeLists.txt mixxx-1.6.1-cmake/src/CMakeLists.txt
--- mixxx-1.6.1/src/CMakeLists.txt 1969-12-31 21:00:00.000000000 -0300
+++ mixxx-1.6.1-cmake/src/CMakeLists.txt 2008-12-05 14:45:51.000000000 -0200
@@ -0,0 +1,391 @@
+INCLUDE_DIRECTORIES(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${QT_INCLUDE_DIR}
+ ${QT_QTMAIN_INCLUDE_DIR}
+ ${QT_QT3SUPPORT_INCLUDE_DIR}
+ ${QT_QTCORE_INCLUDE_DIR}
+ ${QT_QTGUI_INCLUDE_DIR}
+ ${QT_QTXML_INCLUDE_DIR}
+ ${QT_QTOPENGL_INCLUDE_DIR}
+ ${QT_QTSCRIPT_INCLUDE_DIR}
+ )
+
+SET(mixxx_SRCS
+ enginebuffercue.cpp
+ input.cpp
+ mixxxmenuplaylists.cpp
+ trackplaylistlist.cpp
+ mixxxkeyboard.cpp
+ configobject.cpp
+ controlobjectthread.cpp
+ controlobjectthreadwidget.cpp
+ controlobjectthreadmain.cpp
+ controlevent.cpp
+ controllogpotmeter.cpp
+ controlobject.cpp
+ controlnull.cpp
+ controlpotmeter.cpp
+ controlpushbutton.cpp
+ controlttrotary.cpp
+ controlbeat.cpp
+ dlgpreferences.cpp
+ dlgprefsound.cpp
+ dlgprefmidi.cpp
+ dlgprefplaylist.cpp
+ dlgprefcontrols.cpp
+ dlgbpmtap.cpp
+ dlgprefbpm.cpp
+ dlgbpmscheme.cpp
+ dlgabout.cpp
+ dlgprefeq.cpp
+ dlgprefcrossfader.cpp
+ enginebuffer.cpp
+ enginebufferscale.cpp
+ enginebufferscalelinear.cpp
+ engineclipping.cpp
+ enginefilterblock.cpp
+ enginefilteriir.cpp
+ enginefilter.cpp
+ engineobject.cpp
+ enginepregain.cpp
+ enginevolume.cpp
+ main.cpp
+ midiobject.cpp
+ midiobjectnull.cpp
+ mixxx.cpp
+ mixxxview.cpp
+ soundsourceoggvorbis.cpp
+ enginechannel.cpp
+ enginemaster.cpp
+ wwidget.cpp
+ wpixmapstore.cpp
+ wlabel.cpp
+ wnumber.cpp
+ wnumberpos.cpp
+ wnumberrate.cpp
+ wnumberbpm.cpp
+ wknob.cpp
+ wdisplay.cpp
+ wvumeter.cpp
+ wpushbutton.cpp
+ wslidercomposed.cpp
+ wslider.cpp
+ wstatuslight.cpp
+ enginedelay.cpp
+ engineflanger.cpp
+ enginespectralfwd.cpp
+ mathstuff.cpp
+ readerextract.cpp
+ readerextractwave.cpp
+ readerevent.cpp
+ rtthread.cpp
+ windowkaiser.cpp
+ probabilityvector.cpp
+ reader.cpp
+ enginevumeter.cpp
+ soundsourceproxy.cpp
+ peaklist.cpp
+ rotary.cpp
+ log.cpp
+ track.cpp
+ trackcollection.cpp
+ trackplaylist.cpp
+ wtracktableview.cpp
+ wtracktablemodel.cpp
+ wpromotracksmodel.cpp
+ proxymodel.cpp
+ xmlparse.cpp
+ trackimporter.cpp
+ parser.cpp
+ parserpls.cpp
+ parserm3u.cpp
+ enginetemporal.cpp
+ wavesummary.cpp
+ bpmdetector.cpp
+ bpmdetect.cpp
+ bpmscheme.cpp
+ peakfinder.cpp
+ wavesegmentation.cpp
+ woverview.cpp
+ enginebeatseek.cpp
+ enginebufferscalereal.cpp
+ powermate.cpp
+ hercules.cpp
+ joystick.cpp
+ mouse.cpp
+ waveformviewerfactory.cpp
+ wvisualsimple.cpp
+ wwaveformviewer.cpp
+ wglwaveformviewer.cpp
+ waveform/waveformrenderer.cpp
+ waveform/waveformrenderbeat.cpp
+ waveform/waveformrendermark.cpp
+ imginvert.cpp
+ imgloader.cpp
+ imgcolor.cpp
+ wskincolor.cpp
+ trackinfoobject.cpp
+ soundsource.cpp
+ midiledhandler.cpp
+ sounddevice.cpp
+ soundmanager.cpp
+ sounddeviceportaudio.cpp
+ dlgprefrecord.cpp
+ recording/enginerecord.cpp
+ recording/writeaudiofile.cpp
+ enginevinylsoundemu.cpp
+ enginesidechain.cpp
+ wtracktablefilter.cpp
+ wplaylistlistmodel.cpp
+ libraryscanner.cpp
+ libraryscannerdlg.cpp
+ enginefilterbutterworth8.cpp
+ enginexfader.cpp
+ playerinfo.cpp
+ wabstractcontrol.cpp
+ enginebufferscaledummy.cpp
+ enginebufferscalest.cpp
+ wsearchlineedit.cpp)
+
+# UI FILES
+SET (mixxx_UIS
+ dlgpreferencesdlg.ui
+ dlgprefsounddlg.ui
+ dlgprefmididlg.ui
+ dlgprefplaylistdlg.ui
+ dlgprefcontrolsdlg.ui
+ dlgprefeqdlg.ui
+ dlgprefcrossfaderdlg.ui
+ dlgprefbpmdlg.ui
+ dlgbpmschemedlg.ui
+ dlgbpmtapdlg.ui
+ dlgprefvinyldlg.ui
+ dlgprefrecorddlg.ui
+ dlgaboutdlg.ui
+)
+
+# MOC FILES
+SET(mixxx_MOC_HDRS
+ enginebuffercue.h
+ mixxxmenuplaylists.h
+ mixxxkeyboard.h
+ controlobjectthread.h
+ controlobjectthreadwidget.h
+ controlobjectthreadmain.h
+ controllogpotmeter.h
+ controlobject.h
+ controlnull.h
+ controlpotmeter.h
+ controlpushbutton.h
+ controlttrotary.h
+ controlbeat.h
+ dlgpreferences.h
+ dlgprefsound.h
+ dlgprefmidi.h
+ dlgprefplaylist.h
+ dlgprefcontrols.h
+ dlgbpmtap.h
+ dlgprefbpm.h
+ dlgbpmscheme.h
+ dlgabout.h
+ dlgprefeq.h
+ dlgprefcrossfader.h
+ enginebuffer.h
+ enginefilter.h
+ engineobject.h
+ mixxx.h
+ mixxxview.h
+ soundsourcemp3.h
+ wwidget.h
+ wlabel.h
+ wnumber.h
+ wnumberpos.h
+ wnumberrate.h
+ wnumberbpm.h
+ wknob.h
+ wdisplay.h
+ wvumeter.h
+ wpushbutton.h
+ wslidercomposed.h
+ wstatuslight.h
+ log.h
+ track.h
+ trackplaylist.h
+ wtracktableview.h
+ wtracktablemodel.h
+ wpromotracksmodel.h
+ trackimporter.h
+ parser.h
+ parserpls.h
+ parserm3u.h
+ enginetemporal.h
+ soundsourceproxy.h
+ woverview.h
+ wvisualsimple.h
+ wwaveformviewer.h
+ wglwaveformviewer.h
+ waveform/waveformrenderer.h
+ waveform/waveformrenderbeat.h
+ waveform/waveformrendermark.h
+ trackinfoobject.h
+ midiledhandler.h
+ soundmanager.h
+ dlgprefrecord.h
+ wtracktablefilter.h
+ wplaylistlistmodel.h
+ libraryscanner.h
+ libraryscannerdlg.h
+ playerinfo.h
+ wabstractcontrol.h
+ wsearchlineedit.h
+ dlgprefshoutcast.h
+ engineshoutcast.h
+ encodervorbis.h
+ ladspaview.h
+ dlgladspa.h
+ ladspapresetslot.h
+ enginebufferscalest.h
+ script/scriptcontrolqueue.h
+ script/macrolist.h
+ script/scriptstudio.h
+ script/numberrecorder.h
+ script/trackrecorder.h
+ script/qtscriptinterface.h
+ )
+
+ADD_DEFINITIONS(-D__SCRIPT__)
+
+# SCRIPTS
+SET(script_SRCS
+ script/scriptengine.cpp
+ script/scriptcontrolqueue.cpp
+ script/scriptstudio.cpp
+ script/scriptrecorder.cpp
+ script/playinterface.cpp
+ script/macro.cpp
+ script/scriptcontrolevent.cpp
+ script/trackcontrolevent.cpp
+ script/numbercontrolevent.cpp
+ script/numberrecorder.cpp
+ script/macrolist.cpp
+ script/trackrecorder.cpp
+ script/sdatetime.cpp
+ script/signalrecorder.cpp
+ script/macrolistitem.cpp
+ script/qtscriptinterface.cpp)
+
+SET (script_UIS script/scriptstudio.ui)
+
+ADD_LIBRARY(mixxxscript STATIC ${script_SRCS} ${script_UIS_SRCS} )
+
+
+IF(SAMPLERATE_FOUND)
+ SET(mixxx_SRCS ${mixxx_SRCS} enginebufferscalesrc.cpp)
+ENDIF(SAMPLERATE_FOUND)
+
+IF(GPOD_FOUND)
+ SET(mixxx_SRCS ${mixxx_SRCS} wipodtracksmodel.cpp)
+ SET(mixxx_MOC_HDRS ${mixxx_MOC_HDRS} wipodtracksmodel.h)
+ENDIF(GPOD_FOUND)
+
+IF(FFMPEG_FOUND)
+ SET(mixxx_SRCS ${mixxx_SRCS} soundsourceffmpeg.cpp)
+ENDIF(FFMPEG_FOUND)
+
+IF(SHOUT_FOUND AND SPEEX_FOUND)
+ SET(mixxx_SRCS ${mixxx_SRCS}
+ dlgprefshoutcast.cpp
+ engineshoutcast.cpp
+ encodervorbis.cpp
+ )
+
+ SET (mixxx_UIS ${mixxx_UIS} dlgprefshoutcastdlg.ui)
+ENDIF(SHOUT_FOUND AND SPEEX_FOUND)
+
+IF(LADSPA_FOUND)
+ SET(mixxx_SRCS ${mixxx_SRCS}
+ engineladspa.cpp
+ ladspaloader.cpp
+ ladspalibrary.cpp
+ ladspaplugin.cpp
+ ladspainstance.cpp
+ ladspacontrol.cpp
+ ladspainstancestereo.cpp
+ ladspainstancemono.cpp
+ ladspaview.cpp
+ ladspapreset.cpp
+ ladspapresetmanager.cpp
+ ladspapresetknob.cpp
+ ladspapresetinstance.cpp
+ dlgladspa.cpp
+ ladspapresetslot.cpp
+ )
+ENDIF(LADSPA_FOUND)
+
+QT4_WRAP_UI(mixxx_UIS_SRCS ${mixxx_UIS} ${script_UIS})
+
+
+QT4_WRAP_CPP(mixxx_MOC_SRCS ${mixxx_MOC_HDRS})
+
+
+ADD_DEFINITIONS(-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT)
+
+# Platform code
+IF(WIN32)
+ SET(mixxx_platform_SRCS
+ midiobjectwin.cpp)
+ ADD_DEFINITIONS(-D__WINMIDI__)
+ENDIF(WIN32)
+
+IF(APPLE)
+ SET(mixxx_platform_SRCS
+ midiobjectcoremidi.cpp)
+ ADD_DEFINITIONS(-D__COREMIDI__)
+
+ENDIF(APPLE)
+
+IF(UNIX)
+ set(mixxx_platform_SRCS
+ powermatelinux.cpp
+ herculeslinux.cpp
+ joysticklinux.cpp
+ mouselinux.cpp
+ midiobjectalsaseq.cpp
+ soundsourcesndfile.cpp
+ )
+ ADD_DEFINITIONS(-D__ALSASEQMIDI__ -D__SNDFILE_)
+ENDIF(UNIX)
+
+ADD_EXECUTABLE(mixxx ${mixxx_SRCS} ${mixxx_platform_SRCS} ${mixxx_MOC_SRCS} ${mixxx_UIS_SRCS} ${script_SRCS})
+
+ADD_DEPENDENCIES(mixxx
+ soundtouch
+ kissfft
+ fidlib
+ )
+
+MESSAGE(STATUS "LIBRARIES ${FFMPEG_LIBRARIES}")
+
+TARGET_LINK_LIBRARIES(mixxx
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTGUI_LIBRARY}
+ ${QT_QTOPENGL_LIBRARY}
+ ${QT_QTXML_LIBRARY}
+ ${QT_QT3SUPPORT_LIBRARY}
+ ${QT_QTSCRIPT_LIBRARY}
+ ${DJCONSOLE_LIBRARIES}
+ ${PORTAUDIO_LIBRARIES}
+ ${GPOD_LIBRARIES}
+ ${SAMPLERATE_LIBRARIES}
+ ${SHOUT_LIBRARIES}
+ ${SPEEX_LIBRARIES}
+ ${OGGVORBIS_LIBRARIES}
+ ${FFMPEG_LIBRARIES}
+ ${SNDFILE_LIBRARIES}
+ ${ID3TAG_LIBRARIES}
+ kissfft
+ soundtouch
+ fidlib
+ )
+
diff -r -N -u -x '*.pyc' -x '*.o' -x build -x cache -x '*~' -x config.log mixxx-1.6.1/src/.mixxx_flags.svn mixxx-1.6.1-cmake/src/.mixxx_flags.svn
--- mixxx-1.6.1/src/.mixxx_flags.svn 1969-12-31 21:00:00.000000000 -0300
+++ mixxx-1.6.1-cmake/src/.mixxx_flags.svn 2008-10-21 18:19:06.000000000 -0200
@@ -0,0 +1 @@
+#define BUILD_FLAGS "hifieq vinylcontrol optimize=1 "
diff -r -N -u -x '*.pyc' -x '*.o' -x build -x cache -x '*~' -x config.log mixxx-1.6.1/src/.mixxx_version.svn mixxx-1.6.1-cmake/src/.mixxx_version.svn
--- mixxx-1.6.1/src/.mixxx_version.svn 1969-12-31 21:00:00.000000000 -0300
+++ mixxx-1.6.1-cmake/src/.mixxx_version.svn 2008-10-21 18:19:05.000000000 -0200
@@ -0,0 +1 @@
+#define BUILD_REV ""
diff -r -N -u -x '*.pyc' -x '*.o' -x build -x cache -x '*~' -x config.log mixxx-1.6.1/src/script/CMakeLists.txt mixxx-1.6.1-cmake/src/script/CMakeLists.txt
--- mixxx-1.6.1/src/script/CMakeLists.txt 1969-12-31 21:00:00.000000000 -0300
+++ mixxx-1.6.1-cmake/src/script/CMakeLists.txt 2008-10-22 00:03:57.000000000 -0200
@@ -0,0 +1,33 @@
+INCLUDE_DIRECTORIES(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+ADD_DEFINITIONS(-D__SCRIPT__)
+
+# SCRIPTS
+SET(script_SRCS
+ scriptengine.cpp
+ scriptcontrolqueue.cpp
+ scriptstudio.cpp
+ scriptrecorder.cpp
+ playinterface.cpp
+ macro.cpp
+ scriptcontrolevent.cpp
+ trackcontrolevent.cpp
+ numbercontrolevent.cpp
+ numberrecorder.cpp
+ macrolist.cpp
+ trackrecorder.cpp
+ sdatetime.cpp
+ signalrecorder.cpp
+ macrolistitem.cpp
+ qtscriptinterface.cpp)
+
+SET (script_UIS scriptstudio.ui)
+
+QT4_WRAP_UI(script_UIS_SRCS ${script_UIS})
+
+ADD_LIBRARY(mixxxscript STATIC ${script_SRCS} ${script_UIS_SRCS} )
+
+TARGET_LINK_LIBRARIES(mixxxscript ${QT_QTSCRIPT_LIBRARY})
diff -r -N -u -x '*.pyc' -x '*.o' -x build -x cache -x '*~' -x config.log mixxx-1.6.1/src/script/scriptstudio.h mixxx-1.6.1-cmake/src/script/scriptstudio.h
--- mixxx-1.6.1/src/script/scriptstudio.h 2008-01-11 04:49:12.000000000 -0200
+++ mixxx-1.6.1-cmake/src/script/scriptstudio.h 2008-10-22 00:12:38.000000000 -0200
@@ -2,7 +2,7 @@
#define SCRIPT_SCRIPTSTUDIO_H
// Has to be included with wierd path so that it finds this generated in .obj
-#include "script/ui_scriptstudio.h"
+#include "ui_scriptstudio.h"
#include "scriptengine.h"
diff -r -N -u -x '*.pyc' -x '*.o' -x build -x cache -x '*~' -x config.log mixxx-1.6.1/src/soundsourceffmpeg.cpp mixxx-1.6.1-cmake/src/soundsourceffmpeg.cpp
--- mixxx-1.6.1/src/soundsourceffmpeg.cpp 2008-03-27 02:04:43.000000000 -0300
+++ mixxx-1.6.1-cmake/src/soundsourceffmpeg.cpp 2008-10-22 11:20:04.000000000 -0200
@@ -126,7 +126,6 @@
}
filelength = (long int) ((double)pFormatCtx->duration * 2 / AV_TIME_BASE * SRATE);
- qDebug() << "ffmpeg: filelength: " << filelength << "d -|- duration: " << pFormatCtx->duration << "ld -- starttime: " << pFormatCtx->streams[audioStream]->start_time << "ld -- " << AV_TIME_BASE << " " << pFormatCtx->streams[audioStream]->codec_info_duration << "ld";
}
SoundSourceFFmpeg::~SoundSourceFFmpeg()
@@ -282,7 +281,7 @@
//qDebug() << "ffmpeg: before avcodec_decode_audio packet.size(" << packet.size << ")";
tries = 0;
do {
- ret = avcodec_decode_audio(pCodecCtx, (int16_t *)dst, &readsize, src, packet.size - inputsize);
+ ret = avcodec_decode_audio2(pCodecCtx, (int16_t *)dst, &readsize, src, packet.size - inputsize);
if (readsize == 0)
{
tries++;
diff -r -N -u -x '*.pyc' -x '*.o' -x build -x cache -x '*~' -x config.log mixxx-1.6.1/src/soundsourceffmpeg.h mixxx-1.6.1-cmake/src/soundsourceffmpeg.h
--- mixxx-1.6.1/src/soundsourceffmpeg.h 2007-07-15 22:45:38.000000000 -0300
+++ mixxx-1.6.1-cmake/src/soundsourceffmpeg.h 2008-10-21 23:06:19.000000000 -0200
@@ -20,8 +20,8 @@
#include <qstring.h>
#include "soundsource.h"
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/avformat.h>
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
class TrackInfoObject;
diff -r -N -u -x '*.pyc' -x '*.o' -x build -x cache -x '*~' -x config.log mixxx-1.6.1/src/soundsourceproxy.cpp mixxx-1.6.1-cmake/src/soundsourceproxy.cpp
--- mixxx-1.6.1/src/soundsourceproxy.cpp 2008-08-24 03:38:08.000000000 -0300
+++ mixxx-1.6.1-cmake/src/soundsourceproxy.cpp 2008-10-22 10:36:04.000000000 -0200
@@ -39,6 +39,7 @@
SoundSourceProxy::SoundSourceProxy(QString qFilename) : SoundSource(qFilename)
{
+
#ifdef __FFMPEGFILE__
m_pSoundSource = new SoundSourceFFmpeg(qFilename);
return;
@@ -63,7 +64,6 @@
SoundSourceProxy::SoundSourceProxy(TrackInfoObject * pTrack) : SoundSource(pTrack->getLocation())
{
QString qFilename = pTrack->getLocation();
-
#ifdef __FFMPEGFILE__
m_pSoundSource = new SoundSourceFFmpeg(qFilename);
return;
------------------------------------------------------------------------------
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you. Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
_______________________________________________
Mixxx-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mixxx-devel
