[DVDnav-discuss] Reduce remap.h inclusion to where it's needed

[Jean-Baptiste Kempf]

libdvdnav | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Mar  2 12:17:59 2014 +0100| [66b251de3e1a2e1344f5e619ad0e1eff83c4f9b2] | committer: Jean-Baptiste Kempf

Reduce remap.h inclusion to where it's needed

> http://git.videolan.org/gitweb.cgi/libdvdnav.git/?a=commit;h=66b251de3e1a2e1344f5e619ad0e1eff83c4f9b2
---

 src/dvdnav.c     |    2 --
 src/highlight.c  |    1 -
 src/navigation.c |    1 -
 src/read_cache.c |    1 -
 src/remap.c      |    1 -
 src/searching.c  |    1 -
 src/settings.c   |    1 -
 src/vm/decoder.c |    1 -
 src/vm/getset.c  |    1 -
 src/vm/play.c    |    1 -
 src/vm/vm.c      |    1 -
 src/vm/vm.h      |    2 ++
 src/vm/vmcmd.c   |    1 -
 src/vm/vmget.c   |    1 -
 14 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/dvdnav.c b/src/dvdnav.c
index 97e4920..85a82f6 100644
--- a/src/dvdnav.c
+++ b/src/dvdnav.c
@@ -37,13 +37,11 @@
 #include <dvdread/dvd_reader.h>
 #include <dvdread/nav_types.h>
 #include <dvdread/ifo_types.h> /* For vm_cmd_t */
-#include "remap.h"
 #include "vm/decoder.h"
 #include "vm/vm.h"
 #include "dvdnav_internal.h"
 #include "read_cache.h"
 #include <dvdread/nav_read.h>
-#include "remap.h"
 
 static dvdnav_status_t dvdnav_clear(dvdnav_t * this) {
   /* clear everything except file, vm, mutex, readahead */
diff --git a/src/highlight.c b/src/highlight.c
index 01539a8..0bb6ef8 100644
--- a/src/highlight.c
+++ b/src/highlight.c
@@ -31,7 +31,6 @@
 #include <sys/time.h>
 #include <dvdread/nav_types.h>
 #include "dvdnav/dvdnav.h"
-#include "remap.h"
 #include "vm/decoder.h"
 #include "vm/vm.h"
 #include "vm/vmcmd.h"
diff --git a/src/navigation.c b/src/navigation.c
index 50437f2..4fe4a91 100644
--- a/src/navigation.c
+++ b/src/navigation.c
@@ -29,7 +29,6 @@
 #include "dvdnav/dvdnav.h"
 #include <dvdread/nav_types.h>
 #include <dvdread/ifo_types.h>
-#include "remap.h"
 #include "vm/decoder.h"
 #include "vm/vm.h"
 #include "dvdnav_internal.h"
diff --git a/src/read_cache.c b/src/read_cache.c
index a9871fe..23f94e7 100644
--- a/src/read_cache.c
+++ b/src/read_cache.c
@@ -36,7 +36,6 @@
 #include "dvdnav/dvdnav.h"
 #include <dvdread/nav_types.h>
 #include <dvdread/ifo_types.h>
-#include "remap.h"
 #include "vm/decoder.h"
 #include "vm/vm.h"
 #include "dvdnav_internal.h"
diff --git a/src/remap.c b/src/remap.c
index 664300b..a9e2fe3 100644
--- a/src/remap.c
+++ b/src/remap.c
@@ -40,7 +40,6 @@
 #include "dvdnav/dvdnav.h"
 #include <dvdread/nav_types.h>
 #include <dvdread/ifo_types.h>
-#include "remap.h"
 #include "vm/decoder.h"
 #include "vm/vm.h"
 #include "dvdnav_internal.h"
diff --git a/src/searching.c b/src/searching.c
index d0a2f80..054a9c5 100644
--- a/src/searching.c
+++ b/src/searching.c
@@ -32,7 +32,6 @@
 #include "dvdnav/dvdnav.h"
 #include <dvdread/nav_types.h>
 #include <dvdread/ifo_types.h>
-#include "remap.h"
 #include "vm/decoder.h"
 #include "vm/vm.h"
 #include "dvdnav_internal.h"
diff --git a/src/settings.c b/src/settings.c
index b05e9be..e02ec4a 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -29,7 +29,6 @@
 #include "dvdnav/dvdnav.h"
 #include <dvdread/nav_types.h>
 #include <dvdread/ifo_types.h>
-#include "remap.h"
 #include "vm/decoder.h"
 #include "vm/vm.h"
 #include "dvdnav_internal.h"
diff --git a/src/vm/decoder.c b/src/vm/decoder.c
index 84a82c5..1e16a9c 100644
--- a/src/vm/decoder.c
+++ b/src/vm/decoder.c
@@ -36,7 +36,6 @@
 #include <dvdread/ifo_types.h> /* vm_cmd_t */
 
 #include "dvdnav/dvdnav.h"
-#include "remap.h"
 #include "decoder.h"
 #include "vm.h"
 #include "vmcmd.h"
diff --git a/src/vm/getset.c b/src/vm/getset.c
index f286a8f..12b24ec 100644
--- a/src/vm/getset.c
+++ b/src/vm/getset.c
@@ -36,7 +36,6 @@
 #include "dvdnav/dvdnav.h"
 
 #include "decoder.h"
-#include "remap.h"
 #include "vm.h"
 #include "getset.h"
 #include "dvdnav_internal.h"
diff --git a/src/vm/play.c b/src/vm/play.c
index 03d76f7..c338f1a 100644
--- a/src/vm/play.c
+++ b/src/vm/play.c
@@ -35,7 +35,6 @@
 #include "dvdnav/dvdnav.h"
 
 #include "decoder.h"
-#include "remap.h"
 #include "vm.h"
 #include "play.h"
 #include "vm/getset.h"
diff --git a/src/vm/vm.c b/src/vm/vm.c
index d956a38..f50e561 100644
--- a/src/vm/vm.c
+++ b/src/vm/vm.c
@@ -43,7 +43,6 @@
 #include "dvdnav/dvdnav.h"
 
 #include "decoder.h"
-#include "remap.h"
 #include "vm.h"
 #include "play.h"
 #include "getset.h"
diff --git a/src/vm/vm.h b/src/vm/vm.h
index d911202..5fb1284 100644
--- a/src/vm/vm.h
+++ b/src/vm/vm.h
@@ -23,6 +23,8 @@
 #ifndef LIBDVDNAV_VM_H
 #define LIBDVDNAV_VM_H
 
+#include "remap.h"
+
 /**
  * State: SPRM, GPRM, Domain, pgc, pgN, cellN, ?
  */
diff --git a/src/vm/vmcmd.c b/src/vm/vmcmd.c
index 9f07877..cadcd31 100644
--- a/src/vm/vmcmd.c
+++ b/src/vm/vmcmd.c
@@ -34,7 +34,6 @@
 #include <dvdread/nav_types.h>
 #include <dvdread/ifo_types.h>
 #include "decoder.h"
-#include "remap.h"
 #include "vm.h"
 #include "vmcmd.h"
 #include "dvdnav_internal.h"
diff --git a/src/vm/vmget.c b/src/vm/vmget.c
index 80085c5..6f6a5a7 100644
--- a/src/vm/vmget.c
+++ b/src/vm/vmget.c
@@ -37,7 +37,6 @@
 #include "dvdnav/dvdnav.h"
 
 #include "decoder.h"
-#include "remap.h"
 #include "vm.h"
 #include "getset.h"
 #include "dvdnav_internal.h"