Permalink
Browse files

cleaning up header files

  • Loading branch information...
1 parent 89420aa commit cddf486d63d1c55017724adc49c48945894bc1bf @tenderlove committed Sep 27, 2008
Showing with 25 additions and 28 deletions.
  1. +1 −6 ext/decoder.c
  2. +4 −0 ext/decoder.h
  3. +1 −4 ext/get_audio.c
  4. +1 −5 ext/icanhasaudio.c
  5. +9 −0 ext/icanhasaudio.h
  6. +1 −2 ext/mpeg_encoder.c
  7. +0 −3 ext/mpeg_encoder.h
  8. +1 −4 ext/rb_ogg.c
  9. +1 −2 ext/rb_wav.c
  10. +1 −2 ext/rb_wav.h
  11. +2 −0 ext/syncword.c
  12. +3 −0 ext/syncword.h
View
@@ -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)
View
@@ -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
View
@@ -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
View
@@ -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;
View
@@ -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
View
@@ -1,5 +1,4 @@
-#include "mpeg_encoder.h"
-#include <rubyio.h>
+#include <icanhasaudio.h>
static VALUE cMpegEncoder;
View
@@ -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);
View
@@ -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;
View
@@ -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);\
View
@@ -1,5 +1,4 @@
-#include <ogg/ogg.h>
-#include <vorbis/vorbisfile.h>
+#include <icanhasaudio.h>
void prelim_header( VALUE self,
char *headbuf,
View
@@ -1,3 +1,5 @@
+#include <icanhasaudio.h>
+
/*
* Taken from lame, get_audio.c
*/
View
@@ -1,3 +1,6 @@
+#ifndef ICANHASAUDIO_SYNCWORD
+#define ICANHASAUDIO_SYNCWORD
int is_syncword_mp123(const void *const headerptr);
+#endif

0 comments on commit cddf486

Please sign in to comment.