removed .mp3 files from using libmpeg

1 files changed, 1 insertions, 1 deletions

diff --git a/core/multimedia/opieplayer/libmpeg3/libmpeg3.c b/core/multimedia/opieplayer/libmpeg3/libmpeg3.c
index c0fc570..acaecf7 100644
--- a/core/multimedia/opieplayer/libmpeg3/libmpeg3.c
+++ b/core/multimedia/opieplayer/libmpeg3/libmpeg3.c
@@ -1,264 +1,264 @@
 #include "libmpeg3.h"
 #include "mpeg3protos.h"
 
 #include <stdlib.h>
 #include <string.h>
 
 #define MAX(a, b) ((a) > (b) ? (a) : (b))
 
 mpeg3_t* mpeg3_new(char *path)
 {
 	int i;
 	mpeg3_t *file = (mpeg3_t*)calloc(1, sizeof(mpeg3_t));
 	file->cpus = 1;
 	file->fs = mpeg3_new_fs(path);
 	file->have_mmx = mpeg3_mmx_test();
 	file->demuxer = mpeg3_new_demuxer(file, 0, 0, -1);
 	return file;
 }
 
 int mpeg3_delete(mpeg3_t *file)
 {
 	int i;
 
 	for(i = 0; i < file->total_vstreams; i++)
 		mpeg3_delete_vtrack(file, file->vtrack[i]);
 
 	for(i = 0; i < file->total_astreams; i++)
 		mpeg3_delete_atrack(file, file->atrack[i]);
 
 	mpeg3_delete_fs(file->fs);
 	mpeg3_delete_demuxer(file->demuxer);
 	free(file);
 }
 
 int mpeg3_check_sig(char *path)
 {
 	mpeg3_fs_t *fs;
 	unsigned int bits;
 	char *ext;
 	int result = 0;
 
 	fs = mpeg3_new_fs(path);
 	if(mpeg3io_open_file(fs))
 	{
 /* File not found */
 		return 0;
 	}
 
 	bits = mpeg3io_read_int32(fs);
 /* Test header */
 	if(bits == MPEG3_TOC_PREFIX || bits == MPEG3_TOC_PREFIXLOWER)
 	{
 		result = 1;
 	}
 	else
 	if((((bits >> 24) & 0xff) == MPEG3_SYNC_BYTE) ||
 		(bits == MPEG3_PACK_START_CODE) ||
 		((bits & 0xfff00000) == 0xfff00000) ||
 		(bits == MPEG3_SEQUENCE_START_CODE) ||
 		(bits == MPEG3_PICTURE_START_CODE) ||
 		(((bits & 0xffff0000) >> 16) == MPEG3_AC3_START_CODE) ||
 		((bits >> 8) == MPEG3_ID3_PREFIX) ||
 		(bits == MPEG3_RIFF_CODE))
 	{
 		result = 1;
 
 		ext = strrchr(path, '.');
 		if(ext)
 		{
 /* Test file extension. */
 			if(strncasecmp(ext, ".mp2", 4) && 
-				strncasecmp(ext, ".mp3", 4) &&
+//				strncasecmp(ext, ".mp3", 4) &&
 				strncasecmp(ext, ".m1v", 4) &&
 				strncasecmp(ext, ".m2v", 4) &&
 				strncasecmp(ext, ".m2s", 4) &&
 				strncasecmp(ext, ".mpg", 4) &&
 				strncasecmp(ext, ".vob", 4) &&
 				strncasecmp(ext, ".mpeg", 4) &&
 				strncasecmp(ext, ".ac3", 4))
 				result = 0;
 		}
 	}
 
 	mpeg3io_close_file(fs);
 	mpeg3_delete_fs(fs);
 	return result;
 }
 
 mpeg3_t* mpeg3_open_copy(char *path, mpeg3_t *old_file)
 {
 	mpeg3_t *file = 0;
 	unsigned int bits;
 	int i, done;
 
 /* Initialize the file structure */
 	file = mpeg3_new(path);
 
 /* Need to perform authentication before reading a single byte. */
 	if(mpeg3io_open_file(file->fs))
 	{
 		mpeg3_delete(file);
 		return 0;
 	}
 
 /* =============================== Create the title objects ========================= */
 	bits = mpeg3io_read_int32(file->fs);
 
 	if(bits == MPEG3_TOC_PREFIX || bits == MPEG3_TOC_PREFIXLOWER)   /* TOCV */
 	{
 /* Table of contents for another file */
 		if(mpeg3_read_toc(file))
 		{
 			mpeg3_delete(file);
 			return 0;
 		}
 		mpeg3io_close_file(file->fs);
 	}
 	else
 	if(((bits >> 24) & 0xff) == MPEG3_SYNC_BYTE)
 	{
 /* Transport stream */
 		file->packet_size = MPEG3_TS_PACKET_SIZE;
 		file->is_transport_stream = 1;
 	}
 	else
 	if(bits == MPEG3_PACK_START_CODE)
 	{
 /* Program stream */
 		file->packet_size = MPEG3_DVD_PACKET_SIZE;
 		file->is_program_stream = 1;
 	}
 	else
 	if((bits & 0xfff00000) == 0xfff00000 ||
 		((bits >> 8) == MPEG3_ID3_PREFIX) ||
 		(bits == MPEG3_RIFF_CODE))
 	{
 /* MPEG Audio only */
 		file->packet_size = MPEG3_DVD_PACKET_SIZE;
 		file->has_audio = 1;
 		file->is_audio_stream = 1;
 	}
 	else
 	if(bits == MPEG3_SEQUENCE_START_CODE ||
 		bits == MPEG3_PICTURE_START_CODE)
 	{
 /* Video only */
 		file->packet_size = MPEG3_DVD_PACKET_SIZE;
 		file->is_video_stream = 1;
 	}
 	else
 	if(((bits & 0xffff0000) >> 16) == MPEG3_AC3_START_CODE)
 	{
 /* AC3 Audio only */
 		file->packet_size = MPEG3_DVD_PACKET_SIZE;
 		file->has_audio = 1;
 		file->is_audio_stream = 1;
 	}
 	else
 	{
 /*  file->packet_size = MPEG3_DVD_PACKET_SIZE; */
 /*  file->is_audio_stream = 1; */
 		mpeg3_delete(file);
 		fprintf(stderr, "mpeg3_open: not an MPEG 2 stream\n");
 		return 0;
 	}
 
 /* Create title */
 /* Copy timecodes from an old demuxer */
 	if(old_file && mpeg3_get_demuxer(old_file))
 	{
 		mpeg3demux_copy_titles(file->demuxer, mpeg3_get_demuxer(old_file));
 	}
 	else
 /* Start from scratch */
 	if(!file->demuxer->total_titles)
 	{
 		mpeg3demux_create_title(file->demuxer, 0, 0);
 	}
 
 /* =============================== Get title information ========================= */
 	if(file->is_transport_stream || file->is_program_stream)
 	{
 /* Create video tracks */
 /* Video must be created before audio because audio uses the video timecode */
 /* to get its length. */
 		for(i = 0; i < MPEG3_MAX_STREAMS; i++)
 		{
 			if(file->demuxer->vstream_table[i])
 			{
 				file->vtrack[file->total_vstreams] = mpeg3_new_vtrack(file, i, file->demuxer);
 				if(file->vtrack[file->total_vstreams]) file->total_vstreams++;
 			}
 		}
 
 /* Create audio tracks */
 		for(i = 0; i < MPEG3_MAX_STREAMS; i++)
 		{
 			if(file->demuxer->astream_table[i])
 			{
 				file->atrack[file->total_astreams] = mpeg3_new_atrack(file, 
 					i, 
 					file->demuxer->astream_table[i], 
 					file->demuxer);
 				if(file->atrack[file->total_astreams]) file->total_astreams++;
 			}
 		}
 	}
 	else
 	if(file->is_video_stream)
 	{
 /* Create video tracks */
 		file->vtrack[0] = mpeg3_new_vtrack(file, -1, file->demuxer);
 		if(file->vtrack[0]) file->total_vstreams++;
 	}
 	else
 	if(file->is_audio_stream)
 	{
 /* Create audio tracks */
 		file->atrack[0] = mpeg3_new_atrack(file, -1, AUDIO_UNKNOWN, file->demuxer);
 		if(file->atrack[0]) file->total_astreams++;
 	}
 
 	if(file->total_vstreams) file->has_video = 1;
 	if(file->total_astreams) file->has_audio = 1;
 
 	mpeg3io_close_file(file->fs);
 	return file;
 }
 
 mpeg3_t* mpeg3_open(char *path)
 {
 	return mpeg3_open_copy(path, 0);
 }
 
 int mpeg3_close(mpeg3_t *file)
 {
 /* File is closed in the same procedure it is opened in. */
 	mpeg3_delete(file);
 	return 0;
 }
 
 int mpeg3_set_cpus(mpeg3_t *file, int cpus)
 {
 	int i;
 	file->cpus = cpus;
 	for(i = 0; i < file->total_vstreams; i++)
 		mpeg3video_set_cpus(file->vtrack[i]->video, cpus);
 	return 0;
 }
 
 int mpeg3_set_mmx(mpeg3_t *file, int use_mmx)
 {
 	int i;
 	file->have_mmx = use_mmx;
 	for(i = 0; i < file->total_vstreams; i++)
 		mpeg3video_set_mmx(file->vtrack[i]->video, use_mmx);
 	return 0;
 }
 
 int mpeg3_generate_toc(FILE *output, char *path, int timecode_search, int print_streams)
 {
 	mpeg3_t *file = mpeg3_open(path);
 	mpeg3_demuxer_t *demuxer;
 	int i;