Attachment #262 for bug #346

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 346
Collapse All | Expand All

Lines 53-58 Link Here

(-)amarok/CMakeLists.txt (+1 lines)
53	option( WITH_MTP "Enable mtp support" OFF )	53	option( WITH_MTP "Enable mtp support" OFF )
54	option( WITH_RIOKARMA "Enable riokarma support" OFF )	54	option( WITH_RIOKARMA "Enable riokarma support" OFF )
55	option( WITH_DAAP "Enable daap support" OFF )	55	option( WITH_DAAP "Enable daap support" OFF )
		56	option( WITH_MP4V2 "Enable mp4v2 support" OFF )
56		57
57		58
58	##### user requested modules ####################	59	##### user requested modules ####################




    tde_message_fatal( "konqsidebarplugin.h are requested, but not found on your system" )
  endif( )
endif( )

##### check for mp4v2 ###########################

if( WITH_MP4V2 )
  check_include_file( "mp4v2.h" MP4V2_FOUND )
  check_include_file( "mp4v2/mp4v2.h" MP4V2_MP4V2_FOUND )
  if( NOT MP4V2_FOUND )
    if( NOT MP4V2_MP4V2_FOUND )
      tde_message_fatal("MP4V2 support was requested, but not found on your system" )
    endif( NOT MP4V2_MP4V2_FOUND )
  endif( NOT MP4V2_FOUND )
  if( MP4V2_FOUND )
    set( HAVE_MP4V2 1 )
    INCLUDE_DIRECTORIES(${MP4V2_INCLUDE_DIRS})
  endif( MP4V2_FOUND )
  if( MP4V2_MP4V2_FOUND )
    set( HAVE_MP4V2 1 )
    INCLUDE_DIRECTORIES(${MP4V2_INCLUDE_DIRS})
  endif( MP4V2_MP4V2_FOUND )
endif( )

Lines 15-20 Link Here

(-)amarok/amarok/src/engine/helix/helix-engine.cpp (+1 lines)
15	#include <climits>	15	#include <climits>
16	#include <cmath>	16	#include <cmath>
17	#include <stdarg.h>	17	#include <stdarg.h>
		18	#include <cstring>
18		19
19	#include <config.h>	20	#include <config.h>
20		21

Lines 23-28 Link Here

(-)amarok/amarok/src/engine/helix/helix-sp/helix-sp.h (+1 lines)
23	#include <limits.h>	23	#include <limits.h>
24	#include <sys/param.h>	24	#include <sys/param.h>
25	#include <pthread.h>	25	#include <pthread.h>
		26	#include <cstring>
26	#include <vector>	27	#include <vector>
27	#include <config.h>	28	#include <config.h>
28	#include <iostream>	29	#include <iostream>

Lines 15-20 Link Here

(-)amarok/amarok/src/engine/helix/hxplayercontrol.cpp (+2 lines)
15	the alsa guys	15	the alsa guys
16	***************************************************************************/	16	***************************************************************************/
17		17
		18	#include <cstdlib>
		19	#include <cstring>
18	#include <sys/time.h>	20	#include <sys/time.h>
19	#include <sys/types.h>	21	#include <sys/types.h>
20	#include <sys/wait.h>	22	#include <sys/wait.h>




#################################################
#
#  (C) 2010-2011 Serghei Amelian
#  serghei (DOT) amelian (AT) gmail.com
#
#  Improvements and feedback are welcome
#
#  This file is released under GPL >= 2
#
#################################################

include_directories(
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
  ${TAGLIB_INCLUDE_DIRS}
  ${MP4V2_INCLUDE_DIRS}
)

link_directories(
  ${MP4V2_INCLUDE_DIRS}
)


##### tagmp4 (static) ###########################

tde_add_library( tagmp4 STATIC_PIC
  SOURCES
    mp4file.cpp mp4properties.cpp mp4tag.cpp taglib_mp4filetyperesolver.cpp
)

Lines 30-35 Link Here

(-)amarok/amarok/src/metadata/mp4/mp4file.cpp (+1 lines)
30	#include <audioproperties.h>	30	#include <audioproperties.h>
31		31
32	#include <stdint.h>	32	#include <stdint.h>
		33	#include <cstdlib>
33		34
34	#define MP4V2_HAS_WRITE_BUG 1	35	#define MP4V2_HAS_WRITE_BUG 1
35		36

Lines 25-30 Link Here

(-)amarok/amarok/src/metadata/mp4/mp4file.h (+9 lines)
25	#include <tfile.h>	25	#include <tfile.h>
26	#include "mp4properties.h"	26	#include "mp4properties.h"
27		27
		28	typedef signed int int32_t;
		29	typedef unsigned int u_int32_t;
		30
		31	typedef signed short int16_t;
		32	typedef unsigned short u_int16_t;
		33
		34	typedef signed char int8_t;
		35	typedef unsigned char u_int8_t;
		36
28	namespace TagLib {	37	namespace TagLib {
29		38
30	namespace MP4 {	39	namespace MP4 {




 ***************************************************************************/

#include "mp4properties.h"
#include "mp4file.h"

#include <tstring.h>

#include <config.h>
#ifdef HAVE_SYSTEMS_H
#include <systems.h>
#endif

#include <stdint.h>
#include <stdlib.h>
#include <string.h>

#ifndef UINT64_TO_DOUBLE
#define UINT64_TO_DOUBLE(a) ((double)((int64_t)(a)))

Lines 24-34 Link Here

(-)amarok/amarok/src/metadata/mp4/mp4properties.h (-5 / +5 lines)
24		24
25	#include <audioproperties.h>	25	#include <audioproperties.h>
26	#include <tstring.h>	26	#include <tstring.h>
27	#include <mp4.h>	27	#include <mp4v2/mp4v2.h>
28	// mp4.h drags in mp4_config.h that defines these	28	#include <mp4v2/file.h>
29	// get rid of them so they don't conflict with our config.h	29	#include <mp4v2/meta.h>
30	#undef VERSION	30	#include <mp4v2/track_prop.h>
31	#undef PACKAGE	31	#include <mp4v2/track.h>
32		32
33	namespace TagLib {	33	namespace TagLib {
34		34

Lines 24-29 Link Here

(-)amarok/amarok/src/metadata/mp4/mp4tag.cpp (+1 lines)
24		24
25	#include <tag.h>	25	#include <tag.h>
26	#include <stdint.h>	26	#include <stdint.h>
		27	#include <cstdlib>
27		28
28	using namespace TagLib;	29	using namespace TagLib;
29		30

Lines 23-29 Link Here

(-)amarok/amarok/src/metadata/mp4/mp4tag.h (-1 lines)
23		23
24	#include <tag.h>	24	#include <tag.h>
25	#include "mp4file.h"	25	#include "mp4file.h"
26	#include <mp4.h>
27		26
28	namespace TagLib {	27	namespace TagLib {
29		28

Lines 24-29 Link Here

(-)amarok/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp (+1 lines)
24		24
25	#include "taglib_mp4filetyperesolver.h"	25	#include "taglib_mp4filetyperesolver.h"
26	#include "mp4file.h"	26	#include "mp4file.h"
		27	#include <cstring>
27		28
28	TagLib::File MP4FileTypeResolver::createFile(const char fileName,	29	TagLib::File MP4FileTypeResolver::createFile(const char fileName,
29	bool readProperties,	30	bool readProperties,

Return to bug 346

Lines 173-175 Link Here

(-)amarok/ConfigureChecks.cmake (+20 lines)
173	tde_message_fatal( "konqsidebarplugin.h are requested, but not found on your system" )	173	tde_message_fatal( "konqsidebarplugin.h are requested, but not found on your system" )
174	endif( )	174	endif( )
175	endif( )	175	endif( )
		176
		177	##### check for mp4v2 ###########################
		178
		179	if( WITH_MP4V2 )
		180	check_include_file( "mp4v2.h" MP4V2_FOUND )
		181	check_include_file( "mp4v2/mp4v2.h" MP4V2_MP4V2_FOUND )
		182	if( NOT MP4V2_FOUND )
		183	if( NOT MP4V2_MP4V2_FOUND )
		184	tde_message_fatal("MP4V2 support was requested, but not found on your system" )
		185	endif( NOT MP4V2_MP4V2_FOUND )
		186	endif( NOT MP4V2_FOUND )
		187	if( MP4V2_FOUND )
		188	set( HAVE_MP4V2 1 )
		189	INCLUDE_DIRECTORIES(${MP4V2_INCLUDE_DIRS})
		190	endif( MP4V2_FOUND )
		191	if( MP4V2_MP4V2_FOUND )
		192	set( HAVE_MP4V2 1 )
		193	INCLUDE_DIRECTORIES(${MP4V2_INCLUDE_DIRS})
		194	endif( MP4V2_MP4V2_FOUND )
		195	endif( )

Line 0 Link Here

(-)amarok/amarok/src/metadata/mp4/CMakeLists.txt (+29 lines)
	1	#################################################
	2	#
	3	# (C) 2010-2011 Serghei Amelian
	4	# serghei (DOT) amelian (AT) gmail.com
	5	#
	6	# Improvements and feedback are welcome
	7	#
	8	# This file is released under GPL >= 2
	9	#
	10	#################################################
	11
	12	include_directories(
	13	${TDE_INCLUDE_DIR}
	14	${TQT_INCLUDE_DIRS}
	15	${TAGLIB_INCLUDE_DIRS}
	16	${MP4V2_INCLUDE_DIRS}
	17	)
	18
	19	link_directories(
	20	${MP4V2_INCLUDE_DIRS}
	21	)
	22
	23
	24	##### tagmp4 (static) ###########################
	25
	26	tde_add_library( tagmp4 STATIC_PIC
	27	SOURCES
	28	mp4file.cpp mp4properties.cpp mp4tag.cpp taglib_mp4filetyperesolver.cpp
	29	)