summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-03-29 19:45:33 +0000
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-03-29 19:45:33 +0000
commitde8b70199d639a9d33a1a9efc3aecc8f705f88ec (patch)
tree4ffe17c631b860fef7920511116ec66053bfd21f
parentad4d2c7452061fd2c7ef6d73c3ebd48546fb1f0d (diff)
downloadxine-lib-de8b70199d639a9d33a1a9efc3aecc8f705f88ec.tar.gz
xine-lib-de8b70199d639a9d33a1a9efc3aecc8f705f88ec.tar.bz2
Reorder fields to fill hole.
CVS patchset: 8774 CVS date: 2007/03/29 19:45:33
-rw-r--r--src/combined/decoder_wavpack.c9
-rw-r--r--src/input/input_file.c4
2 files changed, 7 insertions, 6 deletions
diff --git a/src/combined/decoder_wavpack.c b/src/combined/decoder_wavpack.c
index 1d51ecd1d..ec14dfbf5 100644
--- a/src/combined/decoder_wavpack.c
+++ b/src/combined/decoder_wavpack.c
@@ -19,7 +19,7 @@
*
* xine interface to libwavpack by Diego Pettenò <flameeyes@gmail.com>
*
- * $Id: decoder_wavpack.c,v 1.13 2007/03/17 07:34:02 dgp85 Exp $
+ * $Id: decoder_wavpack.c,v 1.14 2007/03/29 19:45:33 dgp85 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -45,15 +45,16 @@ typedef struct {
xine_stream_t *stream;
+ uint8_t *buf;
+ size_t buf_size;
+ size_t buf_pos;
+
int sample_rate;
uint16_t bits_per_sample:6;
uint16_t channels:4;
uint16_t output_open:1;
- uint8_t *buf;
- size_t buf_size;
- size_t buf_pos;
} wavpack_decoder_t;
/* Wrapper functions for Wavpack */
diff --git a/src/input/input_file.c b/src/input/input_file.c
index 567a41c9f..fd2b0e733 100644
--- a/src/input/input_file.c
+++ b/src/input/input_file.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: input_file.c,v 1.121 2007/02/25 18:04:08 dgp85 Exp $
+ * $Id: input_file.c,v 1.122 2007/03/29 19:47:17 dgp85 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -66,8 +66,8 @@ typedef struct {
xine_t *xine;
config_values_t *config;
- int show_hidden_files;
char *origin_path;
+ int show_hidden_files;
int mrls_allocated_entries;
xine_mrl_t **mrls;