Define SQUEAK_BUILTIN_PLUGIN in the right place so that Makefile.tools can be

included by plugin Makefiles.

Reduce the number of implciit declarations and compiler warnings in the mpeg3
support source.  Still a few more to be done, but this shows the way.

Author: eliotmiranda

build.win32x86/common/Makefile.tools

@@ -51,7 +51,6 @@ CFLAGS:= -msse2 -ggdb2 -m32 \
 	-mno-rtd -mms-bitfields $(OFLAGS) $(NOBUILTIN) $(WARNINGS)
 
 TZ:=$(shell date +%Z)
-XDEFS:=	-DSQUEAK_BUILTIN_PLUGIN
 DEFS:=	$(COGDEFS) $(WINVER) -DWIN32=1 -DWIN32_FILE_SUPPORT -DNO_ISNAN \
 		-DNO_SERVICE -D'TZ="$(TZ)"' \
 		$(NDEBUG) -DLSB_FIRST -D'VM_NAME="$(VM_NAME)"' $(XDEFS) $(CROQUET)

build.win64x64/common/Makefile.tools

@@ -51,7 +51,6 @@ CFLAGS:= -fdeclspec -msse2 -ggdb2 -m64 \
 	-mno-rtd -mms-bitfields $(OFLAGS) $(NOBUILTIN) $(WARNINGS)
 
 TZ:=$(shell date +%Z)
-XDEFS:=	-DSQUEAK_BUILTIN_PLUGIN
 DEFS:=	$(COGDEFS) $(WINVER) -DWIN64=1 -DWIN32_FILE_SUPPORT -DNO_ISNAN \
 		-DNO_SERVICE -D'TZ="$(TZ)"' \
 		$(NDEBUG) -DLSB_FIRST -D'VM_NAME="$(VM_NAME)"' $(XDEFS) $(CROQUET)

platforms/Cross/plugins/Mpeg3Plugin/libmpeg/audio/header.c

@@ -31,6 +31,7 @@
  */
 
 #include "mpeg3audio.h"
+#include "mpeg3protos.h"
 #include "tables.h"
 
 #include <stdio.h>

platforms/Cross/plugins/Mpeg3Plugin/libmpeg/audio/mpeg3audio.h

@@ -4,6 +4,8 @@
 #ifndef MPEG3AUDIO_H
 #define MPEG3AUDIO_H
 
+typedef struct mpeg3 mpeg3_t;
+
 #include "ac3.h"
 #include "bitstream.h"
 #ifndef M_PI

platforms/Cross/plugins/Mpeg3Plugin/libmpeg/bitstream.h

@@ -24,6 +24,14 @@ typedef struct
 
 unsigned int mpeg3demux_read_char_packet(mpeg3_demuxer_t *demuxer);
 unsigned int mpeg3demux_read_prev_char_packet(mpeg3_demuxer_t *demuxer);
+int mpeg3bits_seek_end(mpeg3_bits_t* stream);
+int mpeg3bits_seek_start(mpeg3_bits_t* stream);
+int mpeg3bits_seek_time(mpeg3_bits_t* stream, double time_position);
+int mpeg3bits_seek_byte(mpeg3_bits_t* stream, long position);
+int mpeg3bits_seek_percentage(mpeg3_bits_t* stream, double percentage);
+void mpeg3bits_start_reverse(mpeg3_bits_t* stream);
+void mpeg3bits_start_forward(mpeg3_bits_t* stream);
+
 
 /* ======================================================================== */
 /*                                 Entry Points */

platforms/Cross/plugins/Mpeg3Plugin/libmpeg/changesForSqueak.c

@@ -36,6 +36,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "mpeg3private.h"
+#include "mpeg3protos.h"
 #include "changesForSqueak.h"
 
 #if defined(TARGET_OS_MAC) && !defined ( __APPLE__ ) && !defined ( __MACH__ )

platforms/Cross/plugins/Mpeg3Plugin/libmpeg/mpeg3atrack.h

@@ -17,4 +17,8 @@ typedef struct
 	long total_samples;
 } mpeg3_atrack_t;
 
+mpeg3_atrack_t* mpeg3_new_atrack(mpeg3_t *file, int stream_id, int is_ac3, mpeg3_demuxer_t *demuxer);
+int mpeg3_delete_atrack(mpeg3_t *file, mpeg3_atrack_t *atrack);
+mpeg3audio_t* mpeg3audio_new(mpeg3_t *file, mpeg3_atrack_t *track, int is_ac3);
+
 #endif

platforms/Cross/plugins/Mpeg3Plugin/libmpeg/mpeg3io.c

@@ -40,18 +40,15 @@
 
 	
  */
+#include "mpeg3io.h"
 #include "mpeg3private.h"
 #include "mpeg3protos.h"
 
 #if defined(__linux__)
 #include <mntent.h>
 #endif
 
-#if defined( TARGET_OS_MAC) && !defined ( __APPLE__ ) && !defined ( __MACH__ )
-#include <stat.h>
-#else
 #include <sys/stat.h>
-#endif
 
 #include <stdlib.h>
 #include <string.h>
@@ -331,18 +328,3 @@ int mpeg3io_end_of_file(mpeg3_fs_t *fs ) {
 
 	return ( ! fs->fd ) || feof(fs->fd);
 }
-
-inline int mpeg3io_fgetc(mpeg3_fs_t *fs) {
-	if (fs->mpeg_is_in_buffer) {
-		unsigned int value;
-		fs->mpeg_is_in_buffer_file_position++;
-		if (fs->mpeg_is_in_buffer_file_position >= fs->mpeg_buffer_size) {
-			fs->mpeg_is_in_buffer_file_position = fs->mpeg_buffer_size;
-			return 0;
-		}
-		value = (unsigned int) fs->mpeg_is_in_buffer[fs->mpeg_is_in_buffer_file_position-1];
-		return value;
-	}
-	return (fs->fd ? fgetc(fs->fd) : 0);
-}
-

platforms/Cross/plugins/Mpeg3Plugin/libmpeg/mpeg3io.h

@@ -35,9 +35,25 @@ typedef struct
 #endif
 
 #define mpeg3io_total_bytes(fs) (((mpeg3_fs_t *)(fs))->total_bytes)
-inline int mpeg3io_fgetc(mpeg3_fs_t *fs);
 
-static inline unsigned int mpeg3io_read_int32(mpeg3_fs_t *fs)
+static inline int
+mpeg3io_fgetc(mpeg3_fs_t *fs) {
+	if (fs->mpeg_is_in_buffer) {
+		unsigned int value;
+		fs->mpeg_is_in_buffer_file_position++;
+		if (fs->mpeg_is_in_buffer_file_position >= fs->mpeg_buffer_size) {
+			fs->mpeg_is_in_buffer_file_position = fs->mpeg_buffer_size;
+			return 0;
+		}
+		value = (unsigned int) fs->mpeg_is_in_buffer[fs->mpeg_is_in_buffer_file_position-1];
+		return value;
+	}
+	return (fs->fd ? fgetc(fs->fd) : 0);
+}
+
+
+static inline unsigned int
+mpeg3io_read_int32(mpeg3_fs_t *fs)
 {
 	int a, b, c, d;
 	unsigned int result;

platforms/Cross/plugins/Mpeg3Plugin/libmpeg/mpeg3private.h

@@ -39,14 +39,16 @@ void memoryFree(void *stuff);
 #endif
 
 
+typedef struct mpeg3 mpeg3_t;
+
 #include "mpeg3atrack.h"
 #include "mpeg3css.h"
 #include "mpeg3io.h"
 #include "mpeg3private.inc"
 #include "mpeg3title.h"
 #include "mpeg3vtrack.h"
 
-typedef struct
+struct mpeg3
 {
 	mpeg3_fs_t *fs;      /* Store entry path here */
 	mpeg3_demuxer_t *demuxer;        /* Master tables */
@@ -72,9 +74,6 @@ typedef struct
 	int program;  /* Number of program to play */
 	int cpus;
 	int have_mmx;
-} mpeg3_t;
-
-
-
+};
 
 #endif