Attachment #77479 for bug #116022

View | Details | Raw Unified | Return to bug 116022
Collapse All | Expand All

Lines 121-128 if test x$WITHXMMS = xyes; then Link Here

(-)faad2/configure.in.orig (-2 lines)
121	fi	121	fi
122		122
123	AM_CONDITIONAL(HAVE_XMMS, true)	123	AM_CONDITIONAL(HAVE_XMMS, true)
124	AC_MSG_NOTICE("xmms plugin requires libmp4v2 to be build")
125	AM_CONDITIONAL(WITH_MP4V2, true)
126	AC_CONFIG_FILES(plugins/xmms/Makefile plugins/xmms/src/Makefile)	124	AC_CONFIG_FILES(plugins/xmms/Makefile plugins/xmms/src/Makefile)
127	else	125	else
128	AC_MSG_NOTICE(no xmms build configured)	126	AC_MSG_NOTICE(no xmms build configured)

Lines 3-13 lib_LTLIBRARIES = libmp4.la Link Here

(-)faad2/plugins/xmms/src/Makefile.am.orig (-4 / +3 lines)
3		3
4	libmp4_la_CFLAGS = `$(XMMS_CONFIG) --cflags` -Wall \	4	libmp4_la_CFLAGS = `$(XMMS_CONFIG) --cflags` -Wall \
5	`$(GTK_CONFIG) --cflags` -DHAVE_GLIB_H=1 \	5	`$(GTK_CONFIG) --cflags` -DHAVE_GLIB_H=1 \
6	-I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2	6	-I$(top_srcdir)/include -I/usr/include/libmp4v2
7		7
8	libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la \	8	libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la
9	$(top_builddir)/common/mp4v2/libmp4v2.la
10		9
11	libmp4_la_LDFLAGS = -module -avoid-version `$(XMMS_CONFIG) --libs` \	10	libmp4_la_LDFLAGS = -module -avoid-version `$(XMMS_CONFIG) --libs` \
12	`$(GTK_CONFIG) --libs` -lpthread -lstdc++	11	`$(GTK_CONFIG) --libs` -lpthread -lstdc++ -lmp4v2
13	libmp4_la_SOURCES = libmp4.c mp4_utils.c aac_utils.c	12	libmp4_la_SOURCES = libmp4.c mp4_utils.c aac_utils.c

Return to bug 116022

Lines 54-60 int getAACTrack(MP4FileHandle file) Link Here

(-)faad2/plugins/xmms/src/mp4_utils.c.orig (-2 / +2 lines)
54	const char *trackType = MP4GetTrackType(file, trackID);	54	const char *trackType = MP4GetTrackType(file, trackID);
55	if(!strcmp(trackType, MP4_AUDIO_TRACK_TYPE)){//we found audio track !	55	if(!strcmp(trackType, MP4_AUDIO_TRACK_TYPE)){//we found audio track !
56	int j=0;	56	int j=0;
57	u_int8_t audiotype = MP4GetTrackAudioType(file, trackID);	57	u_int8_t audiotype = MP4GetTrackEsdsObjectTypeId(file, trackID);
58	while(mp4AudioTypes[j]){ // what kind of audio is ?	58	while(mp4AudioTypes[j]){ // what kind of audio is ?
59	if(mp4AudioTypes[j] == audiotype){	59	if(mp4AudioTypes[j] == audiotype){
60	if(mp4AudioTypes[j] == MP4_MPEG4_AUDIO_TYPE){//MPEG4 audio ok	60	if(mp4AudioTypes[j] == MP4_MPEG4_AUDIO_TYPE){//MPEG4 audio ok
Lines 126-132 void getMP4info(char* file) Link Here
126	printf("Track %d, %s", trackID, trackType);	126	printf("Track %d, %s", trackID, trackType);
127	if(!strcmp(trackType, MP4_AUDIO_TRACK_TYPE)){//we found audio track !	127	if(!strcmp(trackType, MP4_AUDIO_TRACK_TYPE)){//we found audio track !
128	int j=0;	128	int j=0;
129	u_int8_t audiotype = MP4GetTrackAudioType(mp4file, trackID);	129	u_int8_t audiotype = MP4GetTrackEsdsObjectTypeId(mp4file, trackID);
130	while(mp4AudioTypes[j]){ // what kind of audio is ?	130	while(mp4AudioTypes[j]){ // what kind of audio is ?
131	if(mp4AudioTypes[j] == audiotype){	131	if(mp4AudioTypes[j] == audiotype){
132	if(mp4AudioTypes[j] == MP4_MPEG4_AUDIO_TYPE){	132	if(mp4AudioTypes[j] == MP4_MPEG4_AUDIO_TYPE){