cleaning up header files

rdvdijk · Sep 27, 2008 · cddf486 · cddf486
1 parent 89420aa
commit cddf486
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 28 deletions.
diff --git a/ext/decoder.c b/ext/decoder.c
@@ -1,9 +1,4 @@
-#include <ruby.h>
-#include <lame/lame.h>
-#include <assert.h>
-#include <decoder.h>
-#include <get_audio.h>
-#include <rb_wav.h>
+#include <icanhasaudio.h>
 
 int
 lame_decoder(VALUE self, VALUE infile, VALUE outf, mp3data_struct * mp3data)

diff --git a/ext/decoder.h b/ext/decoder.h
@@ -1,3 +1,7 @@
+#ifndef ICANHASAUDIO_LAME_DECODER_H
+#define ICANHASAUDIO_LAME_DECODER_H
+
 int
 lame_decoder(VALUE self, VALUE infile, VALUE outf, mp3data_struct * mp3data);
 
+#endif
diff --git a/ext/get_audio.c b/ext/get_audio.c
@@ -1,7 +1,4 @@
-#include <ruby.h>
-#include <assert.h>
-#include <lame/lame.h>
-#include "get_audio.h"
+#include <icanhasaudio.h>
 
 #define MAX_U_32_NUM 0xFFFFFFFF
 

diff --git a/ext/icanhasaudio.c b/ext/icanhasaudio.c
@@ -6,11 +6,7 @@
  *
  * Released under the GPL
  */
-#include "icanhasaudio.h"
-#include "syncword.h"
-#include "decoder.h"
-#include "mpeg_encoder.h"
-#include "get_audio.h"
+#include <icanhasaudio.h>
 
 static VALUE rb_mAudio;
 static VALUE rb_mMpeg;

diff --git a/ext/icanhasaudio.h b/ext/icanhasaudio.h
@@ -2,7 +2,16 @@
 #define ICANHASAUDIO_H
 
 #include <ruby.h>
+#include <rubyio.h>
 #include <lame/lame.h>
 #include <dlfcn.h>
+#include <assert.h>
+#include <syncword.h>
+#include <decoder.h>
+#include <mpeg_encoder.h>
+#include <get_audio.h>
+#include <ogg/ogg.h>
+#include <vorbis/vorbisfile.h>
+#include <rb_wav.h>
 
 #endif
diff --git a/ext/mpeg_encoder.c b/ext/mpeg_encoder.c
@@ -1,5 +1,4 @@
-#include "mpeg_encoder.h"
-#include <rubyio.h>
+#include <icanhasaudio.h>
 
 static VALUE cMpegEncoder;
 

diff --git a/ext/mpeg_encoder.h b/ext/mpeg_encoder.h
@@ -1,9 +1,6 @@
 #ifndef MPEG_ENCODER_H
 #define MPEG_ENCODER_H
 
-#include "icanhasaudio.h"
-#include "get_audio.h"
-
 #define LAME_MAXMP3BUFFER 16384
 void init_MpegEncoder(VALUE mMpeg);
 

diff --git a/ext/rb_ogg.c b/ext/rb_ogg.c
@@ -1,7 +1,4 @@
-#include <ruby.h>
-#include <ogg/ogg.h>
-#include <vorbis/vorbisfile.h>
-#include <rb_wav.h>
+#include <icanhasaudio.h>
 
 size_t rb_ogg_read(void *ptr, size_t size, size_t nmemb, void *datasource) {
   VALUE file = (VALUE)datasource;

diff --git a/ext/rb_wav.c b/ext/rb_wav.c
@@ -1,5 +1,4 @@
-#include <ruby.h>
-#include <rb_wav.h>
+#include <icanhasaudio.h>
 
 #define WRITE_U32(buf, x) *(buf)     = (unsigned char)((x)&0xff);\
                           *((buf)+1) = (unsigned char)(((x)>>8)&0xff);\

diff --git a/ext/rb_wav.h b/ext/rb_wav.h
@@ -1,5 +1,4 @@
-#include <ogg/ogg.h>
-#include <vorbis/vorbisfile.h>
+#include <icanhasaudio.h>
 
 void prelim_header( VALUE self,
                     char *headbuf,

diff --git a/ext/syncword.c b/ext/syncword.c
@@ -1,3 +1,5 @@
+#include <icanhasaudio.h>
+
 /*
  * Taken from lame, get_audio.c
  */

diff --git a/ext/syncword.h b/ext/syncword.h
@@ -1,3 +1,6 @@
+#ifndef ICANHASAUDIO_SYNCWORD
+#define ICANHASAUDIO_SYNCWORD
 
 int is_syncword_mp123(const void *const headerptr);
 
+#endif