# HG changeset patch
# User nicodvb
# Date 1177111499 0
# Node ID 52877d182e96690aaeab349d8a14ce5d08709025
# Parent  a5f395f352c934251376e9f5eff8031461e9e588
moved all header inclusions from .h to .c files; my word, I've never seen such a horrible entanglement as in this mess

diff -r a5f395f352c9 -r 52877d182e96 dvdnav.c
--- a/dvdnav.c	Thu Apr 19 15:45:30 2007 +0000
+++ b/dvdnav.c	Fri Apr 20 23:24:59 2007 +0000
@@ -30,6 +30,15 @@
 */
 
 #include <inttypes.h>
+#include "dvd_types.h"
+#include "dvd_reader.h"
+#include "nav_types.h"
+#include "ifo_types.h" /* For vm_cmd_t */
+#include "remap.h"
+#include "vm/decoder.h"
+#include "vm/vm.h"
+#include "dvdnav.h"
+#include "dvdnav_events.h"
 #include "dvdnav_internal.h"
 #include "read_cache.h"
 #include "nav_read.h"
diff -r a5f395f352c9 -r 52877d182e96 dvdnav.h
--- a/dvdnav.h	Thu Apr 19 15:45:30 2007 +0000
+++ b/dvdnav.h	Fri Apr 20 23:24:59 2007 +0000
@@ -35,16 +35,11 @@
 extern "C" {
 #endif
 
-#ifdef DVDNAV_COMPILE
-#  include "dvdnav_events.h"
-#  include "dvd_types.h"
-#  include "dvd_reader.h"
-#  include "ifo_types.h" /* For vm_cmd_t */
-#else
-#  include <dvdnav/dvdnav_events.h>
+#ifndef DVDNAV_COMPILE
 #  include <dvdnav/dvd_types.h>
 #  include <dvdnav/dvd_reader.h>
 #  include <dvdnav/ifo_types.h> /* For vm_cmd_t */
+#  include <dvdnav/dvdnav_events.h>
 #endif
 
 
diff -r a5f395f352c9 -r 52877d182e96 dvdnav_events.h
--- a/dvdnav_events.h	Thu Apr 19 15:45:30 2007 +0000
+++ b/dvdnav_events.h	Fri Apr 20 23:24:59 2007 +0000
@@ -28,11 +28,6 @@
 #ifndef DVDNAV_EVENTS_H_INCLUDED
 #define DVDNAV_EVENTS_H_INCLUDED
 
-#include "ifo_types.h"
-#include "dvd_reader.h"
-#include "nav_types.h"
-
-
 /*
  * DVDNAV_BLOCK_OK
  *
diff -r a5f395f352c9 -r 52877d182e96 dvdnav_internal.h
--- a/dvdnav_internal.h	Thu Apr 19 15:45:30 2007 +0000
+++ b/dvdnav_internal.h	Fri Apr 20 23:24:59 2007 +0000
@@ -65,14 +65,6 @@
 
 #endif /* WIN32 */
 
-/* Uncomment for VM command tracing */
-/* #define TRACE */
-
-#include "decoder.h"
-#include "dvdnav.h"
-#include "vm.h"
-#include "vmcmd.h"
-
 /* where should libdvdnav write its messages (stdout/stderr) */
 #define MSG_OUT stdout
 
diff -r a5f395f352c9 -r 52877d182e96 highlight.c
--- a/highlight.c	Thu Apr 19 15:45:30 2007 +0000
+++ b/highlight.c	Fri Apr 20 23:24:59 2007 +0000
@@ -28,7 +28,13 @@
 #include <assert.h>
 #include <inttypes.h>
 #include "nav_types.h"
+#include "dvd_types.h"
+#include "remap.h"
+#include "vm/decoder.h"
+#include "vm/vm.h"
+#include "vm/vmcmd.h"
 #include "dvdnav_internal.h"
+#include "dvdnav.h"
 
 /*
 #define BUTTON_TESTING
diff -r a5f395f352c9 -r 52877d182e96 navigation.c
--- a/navigation.c	Thu Apr 19 15:45:30 2007 +0000
+++ b/navigation.c	Fri Apr 20 23:24:59 2007 +0000
@@ -26,6 +26,14 @@
 #endif
 
 #include <inttypes.h>
+#include "dvd_types.h"
+#include "nav_types.h"
+#include "ifo_types.h"
+#include "remap.h"
+#include "vm/decoder.h"
+#include "vm/vm.h"
+#include "vm/vmcmd.h"
+#include "dvdnav.h"
 #include "dvdnav_internal.h"
 
 /* Navigation API calls */
diff -r a5f395f352c9 -r 52877d182e96 read_cache.c
--- a/read_cache.c	Thu Apr 19 15:45:30 2007 +0000
+++ b/read_cache.c	Fri Apr 20 23:24:59 2007 +0000
@@ -32,6 +32,13 @@
 #endif
 
 #include <inttypes.h>
+#include "dvd_types.h"
+#include "nav_types.h"
+#include "ifo_types.h"
+#include "remap.h"
+#include "vm/decoder.h"
+#include "vm/vm.h"
+#include "vm/vmcmd.h"
 #include "dvdnav.h"
 #include "dvdnav_internal.h"
 #include "read_cache.h"
diff -r a5f395f352c9 -r 52877d182e96 read_cache.h
--- a/read_cache.h	Thu Apr 19 15:45:30 2007 +0000
+++ b/read_cache.h	Fri Apr 20 23:24:59 2007 +0000
@@ -24,8 +24,6 @@
 #ifndef __DVDNAV_READ_CACHE_H
 #define __DVDNAV_READ_CACHE_H
 
-#include "dvdnav_internal.h"
-
 /* Opaque cache type -- defined in dvdnav_internal.h */
 /* typedef struct read_cache_s read_cache_t; */
 
diff -r a5f395f352c9 -r 52877d182e96 remap.c
--- a/remap.c	Thu Apr 19 15:45:30 2007 +0000
+++ b/remap.c	Fri Apr 20 23:24:59 2007 +0000
@@ -32,7 +32,14 @@
 #endif /* _MSC_VER */
 
 #include <assert.h>
+#include "dvd_types.h"
+#include "nav_types.h"
+#include "ifo_types.h"
 #include "remap.h"
+#include "vm/decoder.h"
+#include "vm/vm.h"
+#include "vm/vmcmd.h"
+#include "dvdnav.h"
 #include "dvdnav_internal.h"
 
 struct block_s {
diff -r a5f395f352c9 -r 52877d182e96 searching.c
--- a/searching.c	Thu Apr 19 15:45:30 2007 +0000
+++ b/searching.c	Fri Apr 20 23:24:59 2007 +0000
@@ -27,6 +27,14 @@
 
 #include <assert.h>
 #include <inttypes.h>
+#include "dvd_types.h"
+#include "nav_types.h"
+#include "ifo_types.h"
+#include "remap.h"
+#include "vm/decoder.h"
+#include "vm/vm.h"
+#include "vm/vmcmd.h"
+#include "dvdnav.h"
 #include "dvdnav_internal.h"
 
 /*
diff -r a5f395f352c9 -r 52877d182e96 settings.c
--- a/settings.c	Thu Apr 19 15:45:30 2007 +0000
+++ b/settings.c	Fri Apr 20 23:24:59 2007 +0000
@@ -25,6 +25,14 @@
 #include "config.h"
 #endif
 
+#include "dvd_types.h"
+#include "nav_types.h"
+#include "ifo_types.h"
+#include "remap.h"
+#include "vm/decoder.h"
+#include "vm/vm.h"
+#include "vm/vmcmd.h"
+#include "dvdnav.h"
 #include "dvdnav_internal.h"
 
 /* Characteristics/setting API calls */
diff -r a5f395f352c9 -r 52877d182e96 vm/decoder.c
--- a/vm/decoder.c	Thu Apr 19 15:45:30 2007 +0000
+++ b/vm/decoder.c	Fri Apr 20 23:24:59 2007 +0000
@@ -31,8 +31,15 @@
 #include <stdlib.h>
 #include <inttypes.h>
 #include <string.h>  /* For memset */
+#include "nav_types.h"
 #include "ifo_types.h" /* vm_cmd_t */
 
+#include "dvd_types.h"
+#include "remap.h"
+#include "decoder.h"
+#include "vm.h"
+#include "vmcmd.h"
+#include "dvdnav.h"
 #include "dvdnav_internal.h"
 
 uint32_t vm_getbits(command_t *command, int32_t start, int32_t count) {
diff -r a5f395f352c9 -r 52877d182e96 vm/decoder.h
--- a/vm/decoder.h	Thu Apr 19 15:45:30 2007 +0000
+++ b/vm/decoder.h	Fri Apr 20 23:24:59 2007 +0000
@@ -28,9 +28,6 @@
 #include <inttypes.h>
 #include <sys/time.h>
 
-#include "ifo_types.h" /*  vm_cmd_t */
-#include "dvdnav_internal.h"
-
 /* link command types */
 typedef enum {
   LinkNoLink  = 0,
diff -r a5f395f352c9 -r 52877d182e96 vm/vm.c
--- a/vm/vm.c	Thu Apr 19 15:45:30 2007 +0000
+++ b/vm/vm.c	Fri Apr 20 23:24:59 2007 +0000
@@ -38,9 +38,16 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
+#include "nav_types.h"
 #include "ifo_types.h"
 #include "ifo_read.h"
+#include "dvd_types.h"
 
+#include "decoder.h"
+#include "remap.h"
+#include "vm.h"
+#include "vmcmd.h"
+#include "dvdnav.h"
 #include "dvdnav_internal.h"
 
 #ifdef _MSC_VER
diff -r a5f395f352c9 -r 52877d182e96 vm/vm.h
--- a/vm/vm.h	Thu Apr 19 15:45:30 2007 +0000
+++ b/vm/vm.h	Fri Apr 20 23:24:59 2007 +0000
@@ -26,9 +26,6 @@
 #ifndef VM_H_INCLUDED
 #define VM_H_INCLUDED
 
-#include "remap.h"
-#include "dvdnav_internal.h"
-
 /* DOMAIN enum */
 
 typedef enum {
@@ -172,6 +169,8 @@
 audio_attr_t vm_get_audio_attr(vm_t *vm, int streamN);
 subp_attr_t  vm_get_subp_attr(vm_t *vm, int streamN);
 
+/* Uncomment for VM command tracing */
+/* #define TRACE */
 #ifdef TRACE
 /* Debug */
 void vm_position_print(vm_t *vm, vm_position_t *position);
diff -r a5f395f352c9 -r 52877d182e96 vm/vmcmd.c
--- a/vm/vmcmd.c	Thu Apr 19 15:45:30 2007 +0000
+++ b/vm/vmcmd.c	Fri Apr 20 23:24:59 2007 +0000
@@ -31,6 +31,14 @@
 #include <ctype.h>
 #include <inttypes.h>
 
+#include "dvd_types.h"
+#include "nav_types.h"
+#include "ifo_types.h"
+#include "decoder.h"
+#include "remap.h"
+#include "vm.h"
+#include "vmcmd.h"
+#include "dvdnav.h"
 #include "dvdnav_internal.h"
 
 /*  freebsd compatibility */
diff -r a5f395f352c9 -r 52877d182e96 vm/vmcmd.h
--- a/vm/vmcmd.h	Thu Apr 19 15:45:30 2007 +0000
+++ b/vm/vmcmd.h	Fri Apr 20 23:24:59 2007 +0000
@@ -25,8 +25,6 @@
 #ifndef VMCMD_H_INCLUDED
 #define VMCMD_H_INCLUDED
 
-#include <inttypes.h>
-
 void vm_print_mnemonic(vm_cmd_t *command);
 void vm_print_cmd(int row, vm_cmd_t *command);