We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] New API has been added to support mp3 music play from remote (HTTP/FTP)

diff.patch (text/plain), 4.99 KB, created by Amit Jain on 2015-07-24 08:24:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Amit Jain

Created: 2015-07-24 08:24:39 UTC

Size: 4.99 KB

patch

obsolete

>diff -rwc SDL_mixer-2.0.0/dynamic_mp3.c SDL_mixer-2.0.0_modified/dynamic_mp3.c
>*** SDL_mixer-2.0.0/dynamic_mp3.c	2013-08-10 23:09:55.000000000 +0530
>--- SDL_mixer-2.0.0_modified/dynamic_mp3.c	2015-07-17 02:21:49.865187600 +0530
>***************
>*** 72,77 ****
>--- 72,84 ----
>              SDL_UnloadObject(smpeg.handle);
>              return -1;
>          }
>+         smpeg.SMPEG_new_descr =
>+             (SMPEG* (*)(int, SMPEG_Info*, int))
>+             SDL_LoadFunction(smpeg.handle, "SMPEG_new_descr");
>+         if ( smpeg.SMPEG_new_descr == NULL ) {
>+             SDL_UnloadObject(smpeg.handle);
>+             return -1;
>+         }
>          smpeg.SMPEG_play =
>              (void (*)( SMPEG* ))
>              SDL_LoadFunction(smpeg.handle, "SMPEG_play");
>diff -rwc SDL_mixer-2.0.0/dynamic_mp3.h SDL_mixer-2.0.0_modified/dynamic_mp3.h
>*** SDL_mixer-2.0.0/dynamic_mp3.h	2013-08-10 23:09:55.000000000 +0530
>--- SDL_mixer-2.0.0_modified/dynamic_mp3.h	2015-07-11 04:45:00.029744000 +0530
>***************
>*** 30,35 ****
>--- 30,36 ----
>      void (*SMPEG_enableaudio)( SMPEG* mpeg, int enable );
>      void (*SMPEG_enablevideo)( SMPEG* mpeg, int enable );
>      SMPEG* (*SMPEG_new_rwops)(SDL_RWops *src, SMPEG_Info* info, int freesrc, int sdl_audio);
>+ 	SMPEG* (*SMPEG_new_descr)(int file, SMPEG_Info* info, int sdl_audio);
>      void (*SMPEG_play)( SMPEG* mpeg );
>      int (*SMPEG_playAudio)( SMPEG *mpeg, Uint8 *stream, int len );
>      void (*SMPEG_rewind)( SMPEG* mpeg );
>diff -rwc SDL_mixer-2.0.0/music.c SDL_mixer-2.0.0_modified/music.c
>*** SDL_mixer-2.0.0/music.c	2013-08-10 23:09:58.000000000 +0530
>--- SDL_mixer-2.0.0_modified/music.c	2015-07-21 01:44:36.335756000 +0530
>***************
>*** 122,127 ****
>--- 122,128 ----
>      int fade_step;
>      int fade_steps;
>      int error;
>+ 	int isRemoteFile;
>  };
>  #ifdef MID_MUSIC
>  #ifdef USE_TIMIDITY_MIDI
>***************
>*** 511,516 ****
>--- 512,564 ----
>      return MUS_MOD;
>  }
>  
>+ /* Load Music file at remote location, through socket descriptor */
>+ Mix_Music *Mix_LoadMUS_Remote(int socketDescriptor, Mix_MusicType type)
>+ {
>+ 	Mix_Music *music;
>+     /* Allocate memory for the music structure */
>+     music = (Mix_Music *)SDL_malloc(sizeof(Mix_Music));
>+     if (music == NULL ) {
>+         Mix_SetError("Out of memory");
>+         return NULL;
>+     }
>+ 	music->error = 1;
>+ 	music->isRemoteFile = 1;
>+ 	switch(type)
>+ 	{
>+ #ifdef MP3_MUSIC
>+ 	case MUS_MP3:
>+ 		 if (Mix_Init(MIX_INIT_MP3)) {
>+ 		    SMPEG_Info info;
>+ 			if(smpeg.SMPEG_new_descr==NULL || smpeg.SMPEG_actualSpec==NULL){
>+ 				Mix_SetError("smpeg library load error");
>+ 				break;
>+ 			}
>+ 			music->data.mp3 = smpeg.SMPEG_new_descr(socketDescriptor, &info, 0);
>+ 			if (!info.has_audio){
>+ 				Mix_SetError("mp3 file does not have any audio stream.");
>+ 	            smpeg.SMPEG_delete(music->data.mp3);
>+ 				break;
>+ 			}
>+ 			music->type = MUS_MP3;
>+ 			smpeg.SMPEG_actualSpec(music->data.mp3, &used_mixer);
>+ 			music->error = 0;
>+ 		 }
>+ 		break;
>+ #endif
>+ 	default:
>+         Mix_SetError("Unrecognized music format");
>+ 		break;
>+ 	}
>+ 
>+ 	if(music->error)
>+ 	{
>+ 		SDL_free(music);
>+ 		music = NULL;
>+ 	}
>+ 	return music;
>+ 
>+ }
>  /* Load a music file */
>  Mix_Music *Mix_LoadMUS(const char *file)
>  {
>***************
>*** 527,532 ****
>--- 575,581 ----
>              Mix_SetError("Out of memory");
>              return(NULL);
>          }
>+ 		music->isRemoteFile = 0;
>          music->error = 0;
>          music->type = MUS_CMD;
>          music->data.cmd = MusicCMD_LoadSong(music_cmd, file);
>***************
>*** 621,627 ****
>          return NULL;
>      }
>      music->error = 1;
>! 
>      switch (type) {
>  #ifdef WAV_MUSIC
>      case MUS_WAV:
>--- 670,676 ----
>          return NULL;
>      }
>      music->error = 1;
>! 	music->isRemoteFile = 0;
>      switch (type) {
>  #ifdef WAV_MUSIC
>      case MUS_WAV:
>***************
>*** 1073,1083 ****
>--- 1122,1135 ----
>  #endif
>  #ifdef MP3_MUSIC
>          case MUS_MP3:
>+ 		if(music_playing->isRemoteFile == 0)
>+ 		{
>          	smpeg.SMPEG_rewind(music_playing->data.mp3);
>          	smpeg.SMPEG_play(music_playing->data.mp3);
>  	        if ( position > 0.0 ) {
>      	        smpeg.SMPEG_skip(music_playing->data.mp3, (float)position);
>          	}
>+ 		}
>          break;
>  #endif
>  #ifdef MP3_MAD_MUSIC
>diff -rwc SDL_mixer-2.0.0/SDL_mixer.h SDL_mixer-2.0.0_modified/SDL_mixer.h
>*** SDL_mixer-2.0.0/SDL_mixer.h	2013-08-10 23:09:54.000000000 +0530
>--- SDL_mixer-2.0.0_modified/SDL_mixer.h	2015-07-17 22:40:16.431072000 +0530
>***************
>*** 150,155 ****
>--- 150,158 ----
>  #define Mix_LoadWAV(file)   Mix_LoadWAV_RW(SDL_RWFromFile(file, "rb"), 1)
>  extern DECLSPEC Mix_Music * SDLCALL Mix_LoadMUS(const char *file);
>  
>+ /* Load Music file at remote location, through socket descriptor */
>+ extern DECLSPEC Mix_Music * SDLCALL Mix_LoadMUS_Remote(int socketDescriptor, Mix_MusicType type);
>+ 
>  /* Load a music file from an SDL_RWop object (Ogg and MikMod specific currently)
>     Matt Campbell (matt@campbellhome.dhs.org) April 2000 */
>  extern DECLSPEC Mix_Music * SDLCALL Mix_LoadMUS_RW(SDL_RWops *src, int freesrc);

Actions: View | Diff

Attachments on bug 3070: 2225

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.