Mercurial > audlegacy-plugins
changeset 2594:2aabd6b00bbf
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Wed, 21 May 2008 00:47:13 +0300 |
| parents | 8f5999909416 (current diff) f4dce14ed238 (diff) |
| children | cde42a37ccf6 |
| files | |
| diffstat | 5 files changed, 50 insertions(+), 48 deletions(-) [+] |
line wrap: on
line diff
--- a/src/sid/xs_length.h Tue May 20 22:12:14 2008 +0200 +++ b/src/sid/xs_length.h Wed May 21 00:47:13 2008 +0300 @@ -12,25 +12,25 @@ */ typedef struct _sldb_node_t { xs_md5hash_t md5Hash; /* 128-bit MD5 hash-digest */ - gint nlengths; /* Number of lengths */ - gint *lengths; /* Lengths in seconds */ + gint nlengths; /* Number of lengths */ + gint *lengths; /* Lengths in seconds */ struct _sldb_node_t *prev, *next; } sldb_node_t; typedef struct { - sldb_node_t *nodes, - **pindex; - size_t n; + sldb_node_t *nodes, + **pindex; + size_t n; } xs_sldb_t; /* Functions */ -gint xs_sldb_read(xs_sldb_t *, const gchar *); -gint xs_sldb_index(xs_sldb_t *); -void xs_sldb_free(xs_sldb_t *); -sldb_node_t * xs_sldb_get(xs_sldb_t *, const gchar *); +gint xs_sldb_read(xs_sldb_t *, const gchar *); +gint xs_sldb_index(xs_sldb_t *); +void xs_sldb_free(xs_sldb_t *); +sldb_node_t * xs_sldb_get(xs_sldb_t *, const gchar *); #ifdef __cplusplus }
--- a/src/sid/xs_md5.h Tue May 20 22:12:14 2008 +0200 +++ b/src/sid/xs_md5.h Wed May 21 00:47:13 2008 +0300 @@ -11,11 +11,11 @@ */ typedef struct md5_state_s { guint32 bits[2]; /* message length in bits, lsw first */ - guint32 buf[4]; /* digest buffer */ - guint8 in[64]; /* accumulate block */ + guint32 buf[4]; /* digest buffer */ + guint8 in[64]; /* accumulate block */ } xs_md5state_t; -#define XS_MD5HASH_LENGTH (16) +#define XS_MD5HASH_LENGTH (16) #define XS_MD5HASH_LENGTH_CH (XS_MD5HASH_LENGTH * 2) typedef guint8 xs_md5hash_t[XS_MD5HASH_LENGTH];
--- a/src/sid/xs_player.h Tue May 20 22:12:14 2008 +0200 +++ b/src/sid/xs_player.h Wed May 21 00:47:13 2008 +0300 @@ -16,7 +16,7 @@ gboolean (*plrInit)(struct xs_status_t *); void (*plrClose)(struct xs_status_t *); gboolean (*plrInitSong)(struct xs_status_t *); - guint (*plrFillBuffer)(struct xs_status_t *, gchar *, guint); + guint (*plrFillBuffer)(struct xs_status_t *, gchar *, guint); gboolean (*plrLoadSID)(struct xs_status_t *, gchar *); void (*plrDeleteSID)(struct xs_status_t *); xs_tuneinfo_t* (*plrGetSIDInfo)(const gchar *); @@ -26,22 +26,24 @@ typedef struct xs_status_t { - gint audioFrequency, /* Audio settings */ - audioChannels, - audioBitsPerSample, - oversampleFactor; /* Factor of oversampling */ - AFormat audioFormat; - gboolean oversampleEnable; /* TRUE after sidEngine initialization, - if xs_cfg.oversampleEnable == TRUE and - emulation backend supports oversampling. - */ - void *sidEngine; /* SID-emulation internal engine data */ - xs_player_t *sidPlayer; /* Selected player engine */ - gboolean isError, isPlaying, isInitialized; - gint currSong, /* Current sub-tune */ - lastTime; + gint audioFrequency, /* Audio settings */ + audioChannels, + audioBitsPerSample, + oversampleFactor; /* Factor of oversampling */ + AFormat audioFormat; + gboolean oversampleEnable; /* TRUE after sidEngine initialization, + if xs_cfg.oversampleEnable == TRUE and + emulation backend supports oversampling. + */ + void *sidEngine; /* SID-emulation internal engine data */ + xs_player_t *sidPlayer; /* Selected player engine */ + gboolean isError, + isPlaying, + isInitialized; + gint currSong, /* Current sub-tune */ + lastTime; - xs_tuneinfo_t *tuneInfo; + xs_tuneinfo_t *tuneInfo; } xs_status_t;
--- a/src/sid/xs_slsup.h Tue May 20 22:12:14 2008 +0200 +++ b/src/sid/xs_slsup.h Wed May 21 00:47:13 2008 +0300 @@ -11,18 +11,18 @@ gint xs_stil_init(void); void xs_stil_close(void); -stil_node_t *xs_stil_get(gchar *filename); +stil_node_t *xs_stil_get(gchar *filename); gint xs_songlen_init(void); void xs_songlen_close(void); -sldb_node_t *xs_songlen_get(const gchar *); +sldb_node_t *xs_songlen_get(const gchar *); -xs_tuneinfo_t *xs_tuneinfo_new(const gchar * pcFilename, - gint nsubTunes, gint startTune, const gchar * sidName, - const gchar * sidComposer, const gchar * sidCopyright, - gint loadAddr, gint initAddr, gint playAddr, - gint dataFileLen, const gchar *sidFormat, gint sidModel); -void xs_tuneinfo_free(xs_tuneinfo_t *); +xs_tuneinfo_t *xs_tuneinfo_new(const gchar * pcFilename, + gint nsubTunes, gint startTune, const gchar * sidName, + const gchar * sidComposer, const gchar * sidCopyright, + gint loadAddr, gint initAddr, gint playAddr, + gint dataFileLen, const gchar *sidFormat, gint sidModel); +void xs_tuneinfo_free(xs_tuneinfo_t *); #ifdef __cplusplus
--- a/src/sid/xs_stil.h Tue May 20 22:12:14 2008 +0200 +++ b/src/sid/xs_stil.h Wed May 21 00:47:13 2008 +0300 @@ -10,25 +10,25 @@ /* Types */ typedef struct { - gchar *name, - *author, - *title, - *info; + gchar *name, + *author, + *title, + *info; } stil_subnode_t; typedef struct _stil_node_t { - gchar *filename; - gint nsubTunes; - stil_subnode_t **subTunes; - struct _stil_node_t *prev, *next; + gchar *filename; + gint nsubTunes; + stil_subnode_t **subTunes; + struct _stil_node_t *prev, *next; } stil_node_t; typedef struct { - stil_node_t *nodes, - **pindex; - size_t n; + stil_node_t *nodes, + **pindex; + size_t n; } xs_stildb_t; @@ -37,7 +37,7 @@ gint xs_stildb_read(xs_stildb_t *, gchar *); gint xs_stildb_index(xs_stildb_t *); void xs_stildb_free(xs_stildb_t *); -stil_node_t * xs_stildb_get_node(xs_stildb_t *, gchar *); +stil_node_t * xs_stildb_get_node(xs_stildb_t *, gchar *); #ifdef __cplusplus }