Rename libhb to libmediafork

git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/PixelRatioWorking@241 b64f7644-9d1e-0410-96f1-a4d463321fa5
RPagels · Jan 28, 2007 · 2e41fb8 · 2e41fb8
1 parent cf8f143
commit 2e41fb8
Show file tree

Hide file tree

Showing 28 changed files with 38 additions and 38 deletions.
diff --git a/libmediafork/Jamfile b/libmediafork/Jamfile
@@ -4,15 +4,15 @@
 # Homepage: <http://handbrake.m0k.org/>.
 # It may be used under the terms of the GNU General Public License.
 
-SubDir TOP libhb ;
+SubDir TOP libmediafork ;
 
-LIBHB_SRC =
-common.c hb.c ports.c scan.c work.c decmpeg2.c encavcodec.c update.c
+LIBMEDIAFORK_SRC =
+common.c mediafork.c ports.c scan.c work.c decmpeg2.c encavcodec.c update.c
 demuxmpeg.c fifo.c render.c reader.c muxcommon.c muxmp4.c sync.c
 decsub.c deca52.c encfaac.c declpcm.c encx264.c decavcodec.c encxvid.c
 muxavi.c enclame.c muxogm.c encvorbis.c dvd.c ;
 
-Library libhb : $(LIBHB_SRC) ;
+Library libmediafork : $(LIBMEDIAFORK_SRC) ;
 
-ObjectCcFlags $(LIBHB_SRC) : -I$(TOP)/contrib/include ;
-ObjectDefines $(LIBHB_SRC) : __LIBHB__ ;
+ObjectCcFlags $(LIBMEDIAFORK_SRC) : -I$(TOP)/contrib/include ;
+ObjectDefines $(LIBMEDIAFORK_SRC) : __LIBMEDIAFORK__ ;
diff --git a/libmediafork/common.h b/libmediafork/common.h
@@ -45,7 +45,7 @@ typedef struct hb_fifo_s hb_fifo_t;
 typedef struct hb_lock_s hb_lock_t;
 
 #include "ports.h"
-#ifdef __LIBHB__
+#ifdef __LIBMEDIAFORK__
 #include "internal.h"
 #endif
 
@@ -176,7 +176,7 @@ struct hb_job_s
     int             mux;
     char          * file;
 
-#ifdef __LIBHB__
+#ifdef __LIBMEDIAFORK__
     /* Internal data */
     hb_handle_t   * h;
     hb_lock_t     * pause;
@@ -210,7 +210,7 @@ struct hb_audio_s
     int  bitrate;
     int  channels;
 
-#ifdef __LIBHB__
+#ifdef __LIBMEDIAFORK__
     /* Internal data */
     hb_fifo_t * fifo_in;   /* AC3/MPEG/LPCM ES */
     hb_fifo_t * fifo_raw;  /* Raw audio */
@@ -245,7 +245,7 @@ struct hb_subtitle_s
     int  id;
     char lang[1024];
 
-#ifdef __LIBHB__
+#ifdef __LIBMEDIAFORK__
     /* Internal data */
     hb_fifo_t * fifo_in;  /* SPU ES */
     hb_fifo_t * fifo_raw; /* Decodec SPU */
@@ -346,7 +346,7 @@ struct hb_work_object_s
     int                 id;
     char              * name;
 
-#ifdef __LIBHB__
+#ifdef __LIBMEDIAFORK__
     int              (* init)  ( hb_work_object_t *, hb_job_t * );
     int              (* work)  ( hb_work_object_t *, hb_buffer_t **,
                                  hb_buffer_t ** );

diff --git a/libmediafork/deca52.c b/libmediafork/deca52.c
@@ -4,7 +4,7 @@
    Homepage: <http://handbrake.m0k.org/>.
    It may be used under the terms of the GNU General Public License. */
 
-#include "hb.h"
+#include "mediafork.h"
 
 #include "a52dec/a52.h"
 

diff --git a/libmediafork/decavcodec.c b/libmediafork/decavcodec.c
@@ -4,7 +4,7 @@
    Homepage: <http://handbrake.m0k.org/>.
    It may be used under the terms of the GNU General Public License. */
 
-#include "hb.h"
+#include "mediafork.h"
 
 #include "ffmpeg/avcodec.h"
 

diff --git a/libmediafork/declpcm.c b/libmediafork/declpcm.c
@@ -4,7 +4,7 @@
    Homepage: <http://handbrake.m0k.org/>.
    It may be used under the terms of the GNU General Public License. */
 
-#include "hb.h"
+#include "mediafork.h"
 
 int  declpcmInit( hb_work_object_t *, hb_job_t * );
 int  declpcmWork( hb_work_object_t *, hb_buffer_t **, hb_buffer_t ** );

diff --git a/libmediafork/decmpeg2.c b/libmediafork/decmpeg2.c
@@ -4,7 +4,7 @@
    Homepage: <http://handbrake.m0k.org/>.
    It may be used under the terms of the GNU General Public License. */
 
-#include "hb.h"
+#include "mediafork.h"
 
 #include "mpeg2dec/mpeg2.h"
 

diff --git a/libmediafork/decsub.c b/libmediafork/decsub.c
@@ -4,7 +4,7 @@
    Homepage: <http://handbrake.m0k.org/>.
    It may be used under the terms of the GNU General Public License. */
 
-#include "hb.h"
+#include "mediafork.h"
 
 struct hb_work_private_s
 {

diff --git a/libmediafork/demuxmpeg.c b/libmediafork/demuxmpeg.c
@@ -4,7 +4,7 @@
    Homepage: <http://handbrake.m0k.org/>.
    It may be used under the terms of the GNU General Public License. */
 
-#include "hb.h"
+#include "mediafork.h"
 
 /* Basic MPEG demuxer, only works with DVDs (2048 bytes packets) */
 

diff --git a/libmediafork/dvd.c b/libmediafork/dvd.c
@@ -4,7 +4,7 @@
    Homepage: <http://handbrake.m0k.org/>.
    It may be used under the terms of the GNU General Public License. */
 
-#include "hb.h"
+#include "mediafork.h"
 #include "lang.h"
 
 #include "dvdread/ifo_read.h"

diff --git a/libmediafork/encavcodec.c b/libmediafork/encavcodec.c
@@ -4,7 +4,7 @@
    Homepage: <http://handbrake.m0k.org/>.
    It may be used under the terms of the GNU General Public License. */
 
-#include "hb.h"
+#include "mediafork.h"
 
 #include "ffmpeg/avcodec.h"
 

diff --git a/libmediafork/encfaac.c b/libmediafork/encfaac.c
@@ -4,7 +4,7 @@
    Homepage: <http://handbrake.m0k.org/>.
    It may be used under the terms of the GNU General Public License. */
 
-#include "hb.h"
+#include "mediafork.h"
 
 #include "faac.h"
 

diff --git a/libmediafork/enclame.c b/libmediafork/enclame.c
@@ -4,7 +4,7 @@
    Homepage: <http://handbrake.m0k.org/>.
    It may be used under the terms of the GNU General Public License. */
 
-#include "hb.h"
+#include "mediafork.h"
 
 #include "lame/lame.h"
 

diff --git a/libmediafork/encvorbis.c b/libmediafork/encvorbis.c
@@ -4,7 +4,7 @@
    Homepage: <http://handbrake.m0k.org/>.
    It may be used under the terms of the GNU General Public License. */
 
-#include "hb.h"
+#include "mediafork.h"
 
 #include "vorbis/vorbisenc.h"
 

diff --git a/libmediafork/encx264.c b/libmediafork/encx264.c
@@ -6,7 +6,7 @@ It may be used under the terms of the GNU General Public License. */
 
 #include <stdarg.h>
 
-#include "hb.h"
+#include "mediafork.h"
 
 #include "x264.h"
 

diff --git a/libmediafork/encxvid.c b/libmediafork/encxvid.c
@@ -4,7 +4,7 @@
    Homepage: <http://handbrake.m0k.org/>.
    It may be used under the terms of the GNU General Public License. */
 
-#include "hb.h"
+#include "mediafork.h"
 
 #include "xvid.h"
 

diff --git a/libmediafork/fifo.c b/libmediafork/fifo.c
@@ -4,7 +4,7 @@
    Homepage: <http://handbrake.m0k.org/>.
    It may be used under the terms of the GNU General Public License. */
 
-#include "hb.h"
+#include "mediafork.h"
 
 #ifndef SYS_DARWIN
 #include <malloc.h>

diff --git a/libmediafork/muxavi.c b/libmediafork/muxavi.c
@@ -4,7 +4,7 @@
    Homepage: <http://handbrake.m0k.org/>.
    It may be used under the terms of the GNU General Public License. */
 
-#include "hb.h"
+#include "mediafork.h"
 
 #define AVIF_HASINDEX  0x10
 #define AVIIF_KEYFRAME 0x10

diff --git a/libmediafork/muxcommon.c b/libmediafork/muxcommon.c
@@ -4,7 +4,7 @@
    Homepage: <http://handbrake.m0k.org/>.
    It may be used under the terms of the GNU General Public License. */
 
-#include "hb.h"
+#include "mediafork.h"
 
 struct hb_mux_object_s
 {

diff --git a/libmediafork/muxmp4.c b/libmediafork/muxmp4.c
@@ -6,7 +6,7 @@ It may be used under the terms of the GNU General Public License. */
 
 #include <ffmpeg/avformat.h>
 
-#include "hb.h"
+#include "mediafork.h"
 
 int64_t ff_gcd(int64_t a, int64_t b);
 

diff --git a/libmediafork/muxogm.c b/libmediafork/muxogm.c
@@ -4,7 +4,7 @@
    Homepage: <http://handbrake.m0k.org/>.
    It may be used under the terms of the GNU General Public License. */
 
-#include "hb.h"
+#include "mediafork.h"
 
 #include <ogg/ogg.h>
 

diff --git a/libmediafork/ports.c b/libmediafork/ports.c
@@ -28,7 +28,7 @@
 #include <netinet/in.h>
 //#endif
 
-#include "hb.h"
+#include "mediafork.h"
 
 /************************************************************************
  * hb_get_date()

diff --git a/libmediafork/ports.h b/libmediafork/ports.h
@@ -14,7 +14,7 @@ uint64_t hb_get_date();
 void     hb_snooze( int delay );
 int      hb_get_cpu_count();
 
-#ifdef __LIBHB__
+#ifdef __LIBMEDIAFORK__
 
 /* Everything from now is only used internally and hidden to the UI */
 
@@ -79,7 +79,7 @@ int        hb_net_send( hb_net_t *, char * );
 int        hb_net_recv( hb_net_t *, char *, int );
 void       hb_net_close( hb_net_t ** );
 
-#endif /* __LIBHB__ */
+#endif /* __LIBMEDIAFORK__ */
 
 #endif
 
diff --git a/libmediafork/reader.c b/libmediafork/reader.c
@@ -4,7 +4,7 @@
    Homepage: <http://handbrake.m0k.org/>.
    It may be used under the terms of the GNU General Public License. */
 
-#include "hb.h"
+#include "mediafork.h"
 
 typedef struct
 {

diff --git a/libmediafork/render.c b/libmediafork/render.c
@@ -4,7 +4,7 @@
    Homepage: <http://handbrake.m0k.org/>.
    It may be used under the terms of the GNU General Public License. */
 
-#include "hb.h"
+#include "mediafork.h"
 
 #include "ffmpeg/avcodec.h"
 

diff --git a/libmediafork/scan.c b/libmediafork/scan.c
@@ -4,7 +4,7 @@
    Homepage: <http://handbrake.m0k.org/>.
    It may be used under the terms of the GNU General Public License. */
 
-#include "hb.h"
+#include "mediafork.h"
 #include "a52dec/a52.h"
 
 typedef struct

diff --git a/libmediafork/sync.c b/libmediafork/sync.c
@@ -4,7 +4,7 @@
    Homepage: <http://handbrake.m0k.org/>.
    It may be used under the terms of the GNU General Public License. */
 
-#include "hb.h"
+#include "mediafork.h"
 
 #include "samplerate.h"
 #include "ffmpeg/avcodec.h"

diff --git a/libmediafork/update.c b/libmediafork/update.c
@@ -4,7 +4,7 @@
    Homepage: <http://handbrake.m0k.org/>.
    It may be used under the terms of the GNU General Public License. */
 
-#include "hb.h"
+#include "mediafork.h"
 
 #define HB_URL   "handbrake.m0k.org"
 #define HB_QUERY "GET /LATEST HTTP/1.0\r\nHost: " HB_URL "\r\n\r\n"

diff --git a/libmediafork/work.c b/libmediafork/work.c
@@ -4,7 +4,7 @@
    Homepage: <http://handbrake.m0k.org/>.
    It may be used under the terms of the GNU General Public License. */
 
-#include "hb.h"
+#include "mediafork.h"
 
 typedef struct
 {