Reorder fields and make use of bitmask for boolean values.

1 files changed, 11 insertions, 12 deletions

diff --git a/src/input/input_http.c b/src/input/input_http.c
index a5dff4a8a..5673a74b2 100644
--- a/src/input/input_http.c
+++ b/src/input/input_http.c
@@ -71,7 +71,6 @@ typedef struct {
 
   xine_stream_t   *stream;
   
-  int              fh;
   char            *mrl;
 
   nbc_t           *nbc; 
@@ -85,26 +84,26 @@ typedef struct {
   char             auth[BUFSIZE];
   char             proxyauth[BUFSIZE];
   
+  char             preview[MAX_PREVIEW_SIZE];
+  off_t            preview_size;
+
   char            *proto;
   char            *user;
   char            *password;
   char            *host;
-  int              port;
   char            *uri;
-  
-  char             preview[MAX_PREVIEW_SIZE];
-  off_t            preview_size;
-
-  /* 2 spare bytes here */
+  int              port;
 
-  /* NSV */
-  unsigned char    is_nsv;		/* bool */
+  int              fh;
 
-  /* Last.FM streaming server */
-  unsigned char    is_lastfm;
+  /** Set to 1 if the stream is a NSV stream. */
+  int              is_nsv:1;
+  /** Set to 1 if the stream comes from last.fm. */
+  int              is_lastfm:1;
+  /** Set to 1 if the stream is ShoutCast. */
+  int              shoutcast_mode:1;
 
   /* ShoutCast */
-  unsigned char    shoutcast_mode;	/* bool */
   int              shoutcast_metaint;
   off_t            shoutcast_pos;
   char            *shoutcast_songtitle;