Merge changes happened in 1.1 development.

5 files changed, 22 insertions, 19 deletions

diff --git a/src/libxineadec/.cvsignore b/src/libxineadec/.hgignore
index 7d926a554..7d926a554 100644
--- a/src/libxineadec/.cvsignore
+++ b/src/libxineadec/.hgignore
diff --git a/src/libxineadec/Makefile.am b/src/libxineadec/Makefile.am
index edd259f8f..7f34b4bfd 100644
--- a/src/libxineadec/Makefile.am
+++ b/src/libxineadec/Makefile.am
@@ -20,7 +20,7 @@ xineplug_decode_gsm610_la_LIBADD = \
 xineplug_decode_nsf_la_SOURCES = nsf.c
 xineplug_decode_nsf_la_CFLAGS = $(VISIBILITY_FLAG) -DNSF_PLAYER -fno-strict-aliasing
 xineplug_decode_nsf_la_LDFLAGS = -avoid-version -module
-xineplug_decode_nsf_la_LIBADD = \
+xineplug_decode_nsf_la_LIBADD = -lm \
 	$(XINE_LIB) \
 	$(top_builddir)/src/libxineadec/nosefart/libnosefart.la
 
diff --git a/src/libxineadec/gsm610/.cvsignore b/src/libxineadec/gsm610/.hgignore
index 7d926a554..7d926a554 100644
--- a/src/libxineadec/gsm610/.cvsignore
+++ b/src/libxineadec/gsm610/.hgignore
diff --git a/src/libxineadec/nosefart/.cvsignore b/src/libxineadec/nosefart/.hgignore
index 7d926a554..7d926a554 100644
--- a/src/libxineadec/nosefart/.cvsignore
+++ b/src/libxineadec/nosefart/.hgignore
diff --git a/src/libxineadec/nosefart/nsf.h b/src/libxineadec/nosefart/nsf.h
index 61cc14f60..163e2f62f 100644
--- a/src/libxineadec/nosefart/nsf.h
+++ b/src/libxineadec/nosefart/nsf.h
@@ -20,7 +20,7 @@
 ** nsf.h
 **
 ** NSF loading/saving related defines / prototypes
-** $Id: nsf.h,v 1.2 2003/12/05 15:55:01 f1rmb Exp $
+** $Id: nsf.h,v 1.3 2007/01/18 21:34:10 dgp85 Exp $
 */
 
 #ifndef _NSF_H_
@@ -66,22 +66,22 @@ enum
 typedef struct nsf_s
 {
    /* NESM header */
-   uint8  id[5]               __PACKED__; /* NESM\x1A */
-   uint8  version             __PACKED__; /* spec version */
-   uint8  num_songs           __PACKED__; /* total num songs */
-   uint8  start_song          __PACKED__; /* first song */
-   uint16 load_addr           __PACKED__; /* loc to load code */
-   uint16 init_addr           __PACKED__; /* init call address */
-   uint16 play_addr           __PACKED__; /* play call address */
-   uint8  song_name[32]       __PACKED__; /* name of song */
-   uint8  artist_name[32]     __PACKED__; /* artist name */
-   uint8  copyright[32]       __PACKED__; /* copyright info */
-   uint16 ntsc_speed          __PACKED__; /* playback speed (if NTSC) */
-   uint8  bankswitch_info[8]  __PACKED__; /* initial code banking */
-   uint16 pal_speed           __PACKED__; /* playback speed (if PAL) */
-   uint8  pal_ntsc_bits       __PACKED__; /* NTSC/PAL determination bits */
-   uint8  ext_sound_type      __PACKED__; /* type of external sound gen. */
-   uint8  reserved[4]         __PACKED__; /* reserved */
+   uint8  id[5];               /* NESM\x1A */
+   uint8  version;             /* spec version */
+   uint8  num_songs;           /* total num songs */
+   uint8  start_song;          /* first song */
+   uint16 load_addr;           /* loc to load code */
+   uint16 init_addr;           /* init call address */
+   uint16 play_addr;           /* play call address */
+   uint8  song_name[32];       /* name of song */
+   uint8  artist_name[32];     /* artist name */
+   uint8  copyright[32];       /* copyright info */
+   uint16 ntsc_speed;          /* playback speed (if NTSC) */
+   uint8  bankswitch_info[8];  /* initial code banking */
+   uint16 pal_speed;           /* playback speed (if PAL) */
+   uint8  pal_ntsc_bits;       /* NTSC/PAL determination bits */
+   uint8  ext_sound_type;      /* type of external sound gen. */
+   uint8  reserved[4];         /* reserved */
 
    /* things that the NSF player needs */
    uint8  *data;              /* actual NSF data */
@@ -96,7 +96,7 @@ typedef struct nsf_s
 
    /* our main processing routine, calls all external mixing routines */
    void (*process)(void *buffer, int num_samples);
-} nsf_t;
+} __PACKED__ nsf_t;
 
 /* Function prototypes */
 extern void nsf_init(void);
@@ -114,6 +114,9 @@ extern void nsf_setfilter(nsf_t *nsf, int filter_type);
 
 /*
 ** $Log: nsf.h,v $
+** Revision 1.3  2007/01/18 21:34:10  dgp85
+** __attribute__(packed) is used on the struct, not on its members.
+**
 ** Revision 1.2  2003/12/05 15:55:01  f1rmb
 ** cleanup phase II. use xprintf when it's relevant, use xine_xmalloc when it's relevant too. Small other little fix (can't remember). Change few internal function prototype because it xine_t pointer need to be used if some xine's internal sections. NOTE: libdvd{nav,read} is still too noisy, i will take a look to made it quit, without invasive changes. To be continued...
 **