View | Details | Raw Unified
Collapse All | Expand All

(-) faad2/plugins/xmms/src/mp4_utils.c.orig (-8 / +5 lines)
 Lines 121-128   if test x$WITHXMMS = xyes; then Link Here  
  fi
  fi

        
  AM_CONDITIONAL(HAVE_XMMS, true)
  AM_CONDITIONAL(HAVE_XMMS, true)

            

              
  AC_MSG_NOTICE("xmms plugin requires libmp4v2 to be build")

              
            

            

              
  AM_CONDITIONAL(WITH_MP4V2, true)

              
            

        
  AC_CONFIG_FILES(plugins/xmms/Makefile plugins/xmms/src/Makefile)
  AC_CONFIG_FILES(plugins/xmms/Makefile plugins/xmms/src/Makefile)

        
else
else

        
 AC_MSG_NOTICE(no xmms build configured)
 AC_MSG_NOTICE(no xmms build configured)

  

    

    

       Lines 3-13
      lib_LTLIBRARIES = libmp4.la 
    
  Link Here 
    

  

        

        
libmp4_la_CFLAGS = `$(XMMS_CONFIG) --cflags` -Wall \
libmp4_la_CFLAGS = `$(XMMS_CONFIG) --cflags` -Wall \

        
       `$(GTK_CONFIG) --cflags` -DHAVE_GLIB_H=1 \
       `$(GTK_CONFIG) --cflags` -DHAVE_GLIB_H=1 \

            

              
       -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2

              
       -I$(top_srcdir)/include -I/usr/include/libmp4v2

            

        

            

              
libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la \

              
libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la

            

            

              
       $(top_builddir)/common/mp4v2/libmp4v2.la

              

            

        

        
libmp4_la_LDFLAGS = -module -avoid-version `$(XMMS_CONFIG) --libs` \
libmp4_la_LDFLAGS = -module -avoid-version `$(XMMS_CONFIG) --libs` \

            

              
       `$(GTK_CONFIG) --libs` -lpthread -lstdc++

              
       `$(GTK_CONFIG) --libs` -lpthread -lstdc++ -lmp4v2

            

        
libmp4_la_SOURCES = libmp4.c mp4_utils.c aac_utils.c
libmp4_la_SOURCES = libmp4.c mp4_utils.c aac_utils.c

  

    

    

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

  

        
    const char *trackType = MP4GetTrackType(file, trackID);
    const char *trackType = MP4GetTrackType(file, trackID);

        
    if(!strcmp(trackType, MP4_AUDIO_TRACK_TYPE)){//we found audio track !
    if(!strcmp(trackType, MP4_AUDIO_TRACK_TYPE)){//we found audio track !

        
      int j=0;
      int j=0;

            

              
      u_int8_t audiotype = MP4GetTrackAudioType(file, trackID);

              
      u_int8_t audiotype = MP4GetTrackEsdsObjectTypeId(file, trackID);

            

        
      while(mp4AudioTypes[j]){ // what kind of audio is ?
      while(mp4AudioTypes[j]){ // what kind of audio is ?

        
	if(mp4AudioTypes[j] == audiotype){
	if(mp4AudioTypes[j] == audiotype){

        
	  if(mp4AudioTypes[j] == MP4_MPEG4_AUDIO_TYPE){//MPEG4 audio ok
	  if(mp4AudioTypes[j] == MP4_MPEG4_AUDIO_TYPE){//MPEG4 audio ok

  

    

    

       Lines 126-132
      void getMP4info(char* file) 
    
  Link Here 
    

  

        
    printf("Track %d, %s", trackID, trackType);
    printf("Track %d, %s", trackID, trackType);

        
    if(!strcmp(trackType, MP4_AUDIO_TRACK_TYPE)){//we found audio track !
    if(!strcmp(trackType, MP4_AUDIO_TRACK_TYPE)){//we found audio track !

        
      int j=0;
      int j=0;

            

              
      u_int8_t audiotype = MP4GetTrackAudioType(mp4file, trackID);

              
      u_int8_t audiotype = MP4GetTrackEsdsObjectTypeId(mp4file, trackID);

            

        
      while(mp4AudioTypes[j]){ // what kind of audio is ?
      while(mp4AudioTypes[j]){ // what kind of audio is ?

        
	if(mp4AudioTypes[j] == audiotype){
	if(mp4AudioTypes[j] == audiotype){

        
	  if(mp4AudioTypes[j] == MP4_MPEG4_AUDIO_TYPE){
	  if(mp4AudioTypes[j] == MP4_MPEG4_AUDIO_TYPE){