[vlc-devel] commit: Don't #include LibVLC from plugins ( Rémi Denis-Courmont )

git version control git at videolan.org
Sun Jan 31 20:04:17 CET 2010


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Jan 31 21:03:54 2010 +0200| [b60075e34e36e77b15af7e791f6ba07f2a4863b7] | committer: Rémi Denis-Courmont 

Don't #include LibVLC from plugins

(I was wondering why those kept being recompiled)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b60075e34e36e77b15af7e791f6ba07f2a4863b7
---

 modules/access/rtp/session.c                  |    2 +-
 modules/access/zip/zip.h                      |    1 -
 modules/misc/sqlite.c                         |    1 -
 modules/video_chroma/i420_rgb16.c             |    2 +-
 modules/video_chroma/i420_rgb8.c              |    2 +-
 modules/video_filter/atmo/AtmoDefs.h          |    2 +-
 modules/video_filter/atmo/AtmoLiveView.cpp    |    2 +-
 modules/video_filter/atmo/AtmoPacketQueue.cpp |    2 +-
 8 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/modules/access/rtp/session.c b/modules/access/rtp/session.c
index 8402674..fc8d675 100644
--- a/modules/access/rtp/session.c
+++ b/modules/access/rtp/session.c
@@ -28,7 +28,7 @@
 #include <assert.h>
 #include <errno.h>
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_demux.h>
 
 #include "rtp.h"
diff --git a/modules/access/zip/zip.h b/modules/access/zip/zip.h
index a6d7b62..6137a0e 100644
--- a/modules/access/zip/zip.h
+++ b/modules/access/zip/zip.h
@@ -28,7 +28,6 @@
 #ifndef ZIP_ACCESSDEMUX_H
 #define ZIP_ACCESSDEMUX_H
 
-#include <vlc/vlc.h>
 #include <vlc_common.h>
 #include <vlc_url.h>
 #include <vlc_strings.h>
diff --git a/modules/misc/sqlite.c b/modules/misc/sqlite.c
index 5b89a29..6aad027 100644
--- a/modules/misc/sqlite.c
+++ b/modules/misc/sqlite.c
@@ -31,7 +31,6 @@
 #endif
 
 #include <vlc_common.h>
-#include <vlc/vlc.h>
 #include <vlc_sql.h>
 #include <vlc_plugin.h>
 
diff --git a/modules/video_chroma/i420_rgb16.c b/modules/video_chroma/i420_rgb16.c
index de9428f..b61f9e1 100644
--- a/modules/video_chroma/i420_rgb16.c
+++ b/modules/video_chroma/i420_rgb16.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_filter.h>
 
 #include "i420_rgb.h"
diff --git a/modules/video_chroma/i420_rgb8.c b/modules/video_chroma/i420_rgb8.c
index 8d43532..14581c9 100644
--- a/modules/video_chroma/i420_rgb8.c
+++ b/modules/video_chroma/i420_rgb8.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_filter.h>
 
 #include "i420_rgb.h"
diff --git a/modules/video_filter/atmo/AtmoDefs.h b/modules/video_filter/atmo/AtmoDefs.h
index f919597..ed48e88 100644
--- a/modules/video_filter/atmo/AtmoDefs.h
+++ b/modules/video_filter/atmo/AtmoDefs.h
@@ -14,7 +14,7 @@
 #if defined(__LIBVLC__)
 
 #   include "config.h"
-#   include <vlc/vlc.h>
+#   include <vlc_common.h>
 
 /* some things need to be changed if this code is used inside VideoLan Filter Module */
 #   define _ATMO_VLC_PLUGIN_
diff --git a/modules/video_filter/atmo/AtmoLiveView.cpp b/modules/video_filter/atmo/AtmoLiveView.cpp
index cda99a4..98631ce 100644
--- a/modules/video_filter/atmo/AtmoLiveView.cpp
+++ b/modules/video_filter/atmo/AtmoLiveView.cpp
@@ -13,7 +13,7 @@
 #include "AtmoTools.h"
 
 #if defined(_ATMO_VLC_PLUGIN_)
-#  include <vlc/vlc.h>
+#  include <vlc_common.h>
 #else
 #  include "AtmoGdiDisplayCaptureInput.h"
 #endif
diff --git a/modules/video_filter/atmo/AtmoPacketQueue.cpp b/modules/video_filter/atmo/AtmoPacketQueue.cpp
index 776c8e1..b7d5156 100644
--- a/modules/video_filter/atmo/AtmoPacketQueue.cpp
+++ b/modules/video_filter/atmo/AtmoPacketQueue.cpp
@@ -13,7 +13,7 @@
 #include "AtmoPacketQueue.h"
 
 #if defined(_ATMO_VLC_PLUGIN_)
-# include <vlc/vlc.h>
+# include <vlc_common.h>
 #define MAX_PACKET_TOO_LATE  -30000
 #define MAX_PACKET_TOO_EARLY  30000
 #define MIN_SLEEP_TIME        15000




More information about the vlc-devel mailing list