diff --git a/mythtv/configure b/mythtv/configure index fc533e7222b..e671da3ecbb 100755 --- a/mythtv/configure +++ b/mythtv/configure @@ -6231,5 +6231,8 @@ if ! disabled hdhomerun ; then ${qmakeconf} -o Makefile.lib CONFIG+=Makefile.lib; \ ${qmakeconf} -o Makefile.app CONFIG+=Makefile.app) fi +echo "Configuring libmythbluray..." +(cd external/libmythbluray ; \ + ${qmakeconf} -o Makefile) test -n "$WARNINGS" && printf "\n$WARNINGS" || exit 0 diff --git a/mythtv/external/Makefile b/mythtv/external/Makefile index f21758a4913..6bad9bfb0e4 100644 --- a/mythtv/external/Makefile +++ b/mythtv/external/Makefile @@ -1,6 +1,6 @@ include ../config.mak -SUBDIRS = FFmpeg zeromq nzmqt qjson +SUBDIRS = FFmpeg zeromq nzmqt qjson libmythbluray ifdef CONFIG_HDHOMERUN SUBDIRS += libhdhomerun @@ -54,3 +54,6 @@ libhdhomerun-all libhdhomerun-clean libhdhomerun-distclean libhdhomerun-install ${MAKE} -C libhdhomerun -f Makefile.lib ${@:libhdhomerun-%=%} ${MAKE} -C libhdhomerun -f Makefile.app ${@:libhdhomerun-%=%} +libmythbluray-all libmythbluray-clean libmythbluray-distclean libmythbluray-install libmythbluray-uninstall: + ${MAKE} -C libmythbluray ${@:libmythbluray-%=%} + diff --git a/mythtv/libs/libmythbluray/NOTES b/mythtv/external/libmythbluray/NOTES similarity index 66% rename from mythtv/libs/libmythbluray/NOTES rename to mythtv/external/libmythbluray/NOTES index 47b6f03848e..f05638e0ded 100644 --- a/mythtv/libs/libmythbluray/NOTES +++ b/mythtv/external/libmythbluray/NOTES @@ -1,3 +1,7 @@ +17/12/2012: + +Modifications to utils/ to support streaming from storage groups + 8/23/2010: No current significant differences with upstream. Header files need: diff --git a/mythtv/libs/libmythbluray/bdj/bdj.c b/mythtv/external/libmythbluray/bdj/bdj.c similarity index 100% rename from mythtv/libs/libmythbluray/bdj/bdj.c rename to mythtv/external/libmythbluray/bdj/bdj.c diff --git a/mythtv/libs/libmythbluray/bdj/bdj.h b/mythtv/external/libmythbluray/bdj/bdj.h similarity index 100% rename from mythtv/libs/libmythbluray/bdj/bdj.h rename to mythtv/external/libmythbluray/bdj/bdj.h diff --git a/mythtv/libs/libmythbluray/bdj/bdj_private.h b/mythtv/external/libmythbluray/bdj/bdj_private.h similarity index 100% rename from mythtv/libs/libmythbluray/bdj/bdj_private.h rename to mythtv/external/libmythbluray/bdj/bdj_private.h diff --git a/mythtv/libs/libmythbluray/bdj/bdj_util.c b/mythtv/external/libmythbluray/bdj/bdj_util.c similarity index 100% rename from mythtv/libs/libmythbluray/bdj/bdj_util.c rename to mythtv/external/libmythbluray/bdj/bdj_util.c diff --git a/mythtv/libs/libmythbluray/bdj/bdj_util.h b/mythtv/external/libmythbluray/bdj/bdj_util.h similarity index 100% rename from mythtv/libs/libmythbluray/bdj/bdj_util.h rename to mythtv/external/libmythbluray/bdj/bdj_util.h diff --git a/mythtv/libs/libmythbluray/bdj/bdjo_parser.c b/mythtv/external/libmythbluray/bdj/bdjo_parser.c similarity index 100% rename from mythtv/libs/libmythbluray/bdj/bdjo_parser.c rename to mythtv/external/libmythbluray/bdj/bdjo_parser.c diff --git a/mythtv/libs/libmythbluray/bdj/bdjo_parser.h b/mythtv/external/libmythbluray/bdj/bdjo_parser.h similarity index 100% rename from mythtv/libs/libmythbluray/bdj/bdjo_parser.h rename to mythtv/external/libmythbluray/bdj/bdjo_parser.h diff --git a/mythtv/libs/libmythbluray/bdj/build.xml b/mythtv/external/libmythbluray/bdj/build.xml similarity index 100% rename from mythtv/libs/libmythbluray/bdj/build.xml rename to mythtv/external/libmythbluray/bdj/build.xml diff --git a/mythtv/libs/libmythbluray/bdj/common.h b/mythtv/external/libmythbluray/bdj/common.h similarity index 100% rename from mythtv/libs/libmythbluray/bdj/common.h rename to mythtv/external/libmythbluray/bdj/common.h diff --git a/mythtv/libs/libmythbluray/bdj/java/java/awt/BDRootWindow.java b/mythtv/external/libmythbluray/bdj/java/java/awt/BDRootWindow.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/java/awt/BDRootWindow.java rename to mythtv/external/libmythbluray/bdj/java/java/awt/BDRootWindow.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/CachingControl.java b/mythtv/external/libmythbluray/bdj/java/javax/media/CachingControl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/CachingControl.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/CachingControl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/CachingControlEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/media/CachingControlEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/CachingControlEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/CachingControlEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/Clock.java b/mythtv/external/libmythbluray/bdj/java/javax/media/Clock.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/Clock.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/Clock.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/ClockStartedError.java b/mythtv/external/libmythbluray/bdj/java/javax/media/ClockStartedError.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/ClockStartedError.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/ClockStartedError.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/ClockStoppedException.java b/mythtv/external/libmythbluray/bdj/java/javax/media/ClockStoppedException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/ClockStoppedException.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/ClockStoppedException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/ConnectionErrorEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/media/ConnectionErrorEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/ConnectionErrorEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/ConnectionErrorEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/Control.java b/mythtv/external/libmythbluray/bdj/java/javax/media/Control.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/Control.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/Control.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/Controller.java b/mythtv/external/libmythbluray/bdj/java/javax/media/Controller.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/Controller.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/Controller.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/ControllerClosedEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/media/ControllerClosedEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/ControllerClosedEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/ControllerClosedEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/ControllerErrorEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/media/ControllerErrorEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/ControllerErrorEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/ControllerErrorEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/ControllerEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/media/ControllerEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/ControllerEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/ControllerEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/ControllerListener.java b/mythtv/external/libmythbluray/bdj/java/javax/media/ControllerListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/ControllerListener.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/ControllerListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/DataStarvedEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/media/DataStarvedEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/DataStarvedEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/DataStarvedEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/DeallocateEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/media/DeallocateEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/DeallocateEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/DeallocateEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/Duration.java b/mythtv/external/libmythbluray/bdj/java/javax/media/Duration.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/Duration.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/Duration.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/DurationUpdateEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/media/DurationUpdateEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/DurationUpdateEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/DurationUpdateEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/EndOfMediaEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/media/EndOfMediaEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/EndOfMediaEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/EndOfMediaEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/GainChangeEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/media/GainChangeEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/GainChangeEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/GainChangeEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/GainChangeListener.java b/mythtv/external/libmythbluray/bdj/java/javax/media/GainChangeListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/GainChangeListener.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/GainChangeListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/GainControl.java b/mythtv/external/libmythbluray/bdj/java/javax/media/GainControl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/GainControl.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/GainControl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/IncompatibleSourceException.java b/mythtv/external/libmythbluray/bdj/java/javax/media/IncompatibleSourceException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/IncompatibleSourceException.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/IncompatibleSourceException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/IncompatibleTimeBaseException.java b/mythtv/external/libmythbluray/bdj/java/javax/media/IncompatibleTimeBaseException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/IncompatibleTimeBaseException.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/IncompatibleTimeBaseException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/InternalErrorEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/media/InternalErrorEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/InternalErrorEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/InternalErrorEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/Manager.java b/mythtv/external/libmythbluray/bdj/java/javax/media/Manager.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/Manager.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/Manager.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/MediaError.java b/mythtv/external/libmythbluray/bdj/java/javax/media/MediaError.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/MediaError.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/MediaError.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/MediaEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/media/MediaEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/MediaEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/MediaEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/MediaException.java b/mythtv/external/libmythbluray/bdj/java/javax/media/MediaException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/MediaException.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/MediaException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/MediaHandler.java b/mythtv/external/libmythbluray/bdj/java/javax/media/MediaHandler.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/MediaHandler.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/MediaHandler.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/MediaLocator.java b/mythtv/external/libmythbluray/bdj/java/javax/media/MediaLocator.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/MediaLocator.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/MediaLocator.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/MediaProxy.java b/mythtv/external/libmythbluray/bdj/java/javax/media/MediaProxy.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/MediaProxy.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/MediaProxy.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/MediaTimeSetEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/media/MediaTimeSetEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/MediaTimeSetEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/MediaTimeSetEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/NoDataSourceException.java b/mythtv/external/libmythbluray/bdj/java/javax/media/NoDataSourceException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/NoDataSourceException.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/NoDataSourceException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/NoPlayerException.java b/mythtv/external/libmythbluray/bdj/java/javax/media/NoPlayerException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/NoPlayerException.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/NoPlayerException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/NotPrefetchedError.java b/mythtv/external/libmythbluray/bdj/java/javax/media/NotPrefetchedError.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/NotPrefetchedError.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/NotPrefetchedError.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/NotRealizedError.java b/mythtv/external/libmythbluray/bdj/java/javax/media/NotRealizedError.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/NotRealizedError.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/NotRealizedError.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/PackageManager.java b/mythtv/external/libmythbluray/bdj/java/javax/media/PackageManager.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/PackageManager.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/PackageManager.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/Player.java b/mythtv/external/libmythbluray/bdj/java/javax/media/Player.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/Player.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/Player.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/PrefetchCompleteEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/media/PrefetchCompleteEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/PrefetchCompleteEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/PrefetchCompleteEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/RateChangeEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/media/RateChangeEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/RateChangeEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/RateChangeEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/RealizeCompleteEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/media/RealizeCompleteEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/RealizeCompleteEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/RealizeCompleteEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/ResourceUnavailableEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/media/ResourceUnavailableEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/ResourceUnavailableEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/ResourceUnavailableEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/RestartingEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/media/RestartingEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/RestartingEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/RestartingEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/StartEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/media/StartEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/StartEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/StartEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/StopAtTimeEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/media/StopAtTimeEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/StopAtTimeEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/StopAtTimeEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/StopByRequestEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/media/StopByRequestEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/StopByRequestEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/StopByRequestEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/StopEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/media/StopEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/StopEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/StopEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/StopTimeChangeEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/media/StopTimeChangeEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/StopTimeChangeEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/StopTimeChangeEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/StopTimeSetError.java b/mythtv/external/libmythbluray/bdj/java/javax/media/StopTimeSetError.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/StopTimeSetError.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/StopTimeSetError.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/SystemTimeBase.java b/mythtv/external/libmythbluray/bdj/java/javax/media/SystemTimeBase.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/SystemTimeBase.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/SystemTimeBase.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/Time.java b/mythtv/external/libmythbluray/bdj/java/javax/media/Time.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/Time.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/Time.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/TimeBase.java b/mythtv/external/libmythbluray/bdj/java/javax/media/TimeBase.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/TimeBase.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/TimeBase.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/TransitionEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/media/TransitionEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/TransitionEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/TransitionEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/protocol/ContentDescriptor.java b/mythtv/external/libmythbluray/bdj/java/javax/media/protocol/ContentDescriptor.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/protocol/ContentDescriptor.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/protocol/ContentDescriptor.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/protocol/Controls.java b/mythtv/external/libmythbluray/bdj/java/javax/media/protocol/Controls.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/protocol/Controls.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/protocol/Controls.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/protocol/DataSource.java b/mythtv/external/libmythbluray/bdj/java/javax/media/protocol/DataSource.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/protocol/DataSource.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/protocol/DataSource.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/protocol/Positionable.java b/mythtv/external/libmythbluray/bdj/java/javax/media/protocol/Positionable.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/protocol/Positionable.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/protocol/Positionable.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/protocol/PullDataSource.java b/mythtv/external/libmythbluray/bdj/java/javax/media/protocol/PullDataSource.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/protocol/PullDataSource.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/protocol/PullDataSource.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/protocol/PullSourceStream.java b/mythtv/external/libmythbluray/bdj/java/javax/media/protocol/PullSourceStream.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/protocol/PullSourceStream.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/protocol/PullSourceStream.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/protocol/PushDataSource.java b/mythtv/external/libmythbluray/bdj/java/javax/media/protocol/PushDataSource.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/protocol/PushDataSource.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/protocol/PushDataSource.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/protocol/PushSourceStream.java b/mythtv/external/libmythbluray/bdj/java/javax/media/protocol/PushSourceStream.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/protocol/PushSourceStream.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/protocol/PushSourceStream.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/protocol/RateConfiguration.java b/mythtv/external/libmythbluray/bdj/java/javax/media/protocol/RateConfiguration.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/protocol/RateConfiguration.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/protocol/RateConfiguration.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/protocol/RateConfigureable.java b/mythtv/external/libmythbluray/bdj/java/javax/media/protocol/RateConfigureable.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/protocol/RateConfigureable.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/protocol/RateConfigureable.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/protocol/RateRange.java b/mythtv/external/libmythbluray/bdj/java/javax/media/protocol/RateRange.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/protocol/RateRange.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/protocol/RateRange.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/protocol/Seekable.java b/mythtv/external/libmythbluray/bdj/java/javax/media/protocol/Seekable.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/protocol/Seekable.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/protocol/Seekable.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/protocol/SourceStream.java b/mythtv/external/libmythbluray/bdj/java/javax/media/protocol/SourceStream.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/protocol/SourceStream.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/protocol/SourceStream.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/protocol/SourceTransferHandler.java b/mythtv/external/libmythbluray/bdj/java/javax/media/protocol/SourceTransferHandler.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/protocol/SourceTransferHandler.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/protocol/SourceTransferHandler.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/protocol/URLDataSource.java b/mythtv/external/libmythbluray/bdj/java/javax/media/protocol/URLDataSource.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/protocol/URLDataSource.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/protocol/URLDataSource.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/media/protocol/URLSourceStream.java b/mythtv/external/libmythbluray/bdj/java/javax/media/protocol/URLSourceStream.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/media/protocol/URLSourceStream.java rename to mythtv/external/libmythbluray/bdj/java/javax/media/protocol/URLSourceStream.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/microedition/UnavailableContainerException.java b/mythtv/external/libmythbluray/bdj/java/javax/microedition/UnavailableContainerException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/microedition/UnavailableContainerException.java rename to mythtv/external/libmythbluray/bdj/java/javax/microedition/UnavailableContainerException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/microedition/XletContext.java b/mythtv/external/libmythbluray/bdj/java/javax/microedition/XletContext.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/microedition/XletContext.java rename to mythtv/external/libmythbluray/bdj/java/javax/microedition/XletContext.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/graphics/AlphaColor.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/graphics/AlphaColor.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/graphics/AlphaColor.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/graphics/AlphaColor.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/graphics/TVContainer.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/graphics/TVContainer.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/graphics/TVContainer.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/graphics/TVContainer.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/locator/InvalidLocatorException.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/locator/InvalidLocatorException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/locator/InvalidLocatorException.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/locator/InvalidLocatorException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/locator/Locator.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/locator/Locator.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/locator/Locator.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/locator/Locator.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/locator/LocatorFactory.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/locator/LocatorFactory.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/locator/LocatorFactory.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/locator/LocatorFactory.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/locator/LocatorFactoryImpl.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/locator/LocatorFactoryImpl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/locator/LocatorFactoryImpl.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/locator/LocatorFactoryImpl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/locator/LocatorImpl.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/locator/LocatorImpl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/locator/LocatorImpl.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/locator/LocatorImpl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/locator/MalformedLocatorException.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/locator/MalformedLocatorException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/locator/MalformedLocatorException.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/locator/MalformedLocatorException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/media/AWTVideoSize.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/media/AWTVideoSize.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/media/AWTVideoSize.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/media/AWTVideoSize.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/media/AWTVideoSizeControl.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/media/AWTVideoSizeControl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/media/AWTVideoSizeControl.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/media/AWTVideoSizeControl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/media/MediaSelectCARefusedEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/media/MediaSelectCARefusedEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/media/MediaSelectCARefusedEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/media/MediaSelectCARefusedEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/media/MediaSelectControl.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/media/MediaSelectControl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/media/MediaSelectControl.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/media/MediaSelectControl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/media/MediaSelectEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/media/MediaSelectEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/media/MediaSelectEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/media/MediaSelectEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/media/MediaSelectFailedEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/media/MediaSelectFailedEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/media/MediaSelectFailedEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/media/MediaSelectFailedEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/media/MediaSelectListener.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/media/MediaSelectListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/media/MediaSelectListener.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/media/MediaSelectListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/media/MediaSelectPermission.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/media/MediaSelectPermission.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/media/MediaSelectPermission.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/media/MediaSelectPermission.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/media/MediaSelectSucceededEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/media/MediaSelectSucceededEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/media/MediaSelectSucceededEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/media/MediaSelectSucceededEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/RatingDimension.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/RatingDimension.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/RatingDimension.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/RatingDimension.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/RatingDimensionImpl.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/RatingDimensionImpl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/RatingDimensionImpl.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/RatingDimensionImpl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/ReadPermission.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/ReadPermission.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/ReadPermission.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/ReadPermission.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/SIChangeEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/SIChangeEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/SIChangeEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/SIChangeEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/SIChangeListener.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/SIChangeListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/SIChangeListener.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/SIChangeListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/SIChangeType.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/SIChangeType.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/SIChangeType.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/SIChangeType.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/SIElement.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/SIElement.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/SIElement.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/SIElement.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/SIException.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/SIException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/SIException.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/SIException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/SIManager.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/SIManager.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/SIManager.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/SIManager.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/SIManagerImpl.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/SIManagerImpl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/SIManagerImpl.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/SIManagerImpl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/SIRequest.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/SIRequest.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/SIRequest.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/SIRequest.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/SIRequestFailureType.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/SIRequestFailureType.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/SIRequestFailureType.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/SIRequestFailureType.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/SIRequestor.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/SIRequestor.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/SIRequestor.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/SIRequestor.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/SIRequestorImpl.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/SIRequestorImpl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/SIRequestorImpl.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/SIRequestorImpl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/SIRetrievable.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/SIRetrievable.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/SIRetrievable.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/SIRetrievable.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/Service.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/Service.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/Service.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/Service.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/ServiceInformationType.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/ServiceInformationType.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/ServiceInformationType.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/ServiceInformationType.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/ServiceMinorNumber.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/ServiceMinorNumber.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/ServiceMinorNumber.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/ServiceMinorNumber.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/ServiceNumber.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/ServiceNumber.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/ServiceNumber.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/ServiceNumber.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/ServiceType.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/ServiceType.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/ServiceType.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/ServiceType.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/guide/ContentRatingAdvisory.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/guide/ContentRatingAdvisory.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/guide/ContentRatingAdvisory.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/guide/ContentRatingAdvisory.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/guide/ProgramEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/guide/ProgramEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/guide/ProgramEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/guide/ProgramEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/guide/ProgramEventDescription.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/guide/ProgramEventDescription.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/guide/ProgramEventDescription.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/guide/ProgramEventDescription.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/guide/ProgramSchedule.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/guide/ProgramSchedule.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/guide/ProgramSchedule.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/guide/ProgramSchedule.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/guide/ProgramScheduleChangeType.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/guide/ProgramScheduleChangeType.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/guide/ProgramScheduleChangeType.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/guide/ProgramScheduleChangeType.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/guide/ProgramScheduleEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/guide/ProgramScheduleEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/guide/ProgramScheduleEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/guide/ProgramScheduleEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/guide/ProgramScheduleListener.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/guide/ProgramScheduleListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/guide/ProgramScheduleListener.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/guide/ProgramScheduleListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/CAIdentification.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/CAIdentification.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/CAIdentification.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/CAIdentification.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/DeliverySystemType.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/DeliverySystemType.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/DeliverySystemType.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/DeliverySystemType.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/FavoriteServicesName.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/FavoriteServicesName.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/FavoriteServicesName.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/FavoriteServicesName.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/FilterNotSupportedException.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/FilterNotSupportedException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/FilterNotSupportedException.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/FilterNotSupportedException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/LocatorFilter.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/LocatorFilter.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/LocatorFilter.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/LocatorFilter.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/PreferenceFilter.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/PreferenceFilter.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/PreferenceFilter.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/PreferenceFilter.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/SIElementFilter.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/SIElementFilter.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/SIElementFilter.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/SIElementFilter.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceComponent.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceComponent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceComponent.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceComponent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceComponentChangeEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceComponentChangeEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceComponentChangeEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceComponentChangeEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceComponentChangeListener.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceComponentChangeListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceComponentChangeListener.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceComponentChangeListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceDescription.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceDescription.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceDescription.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceDescription.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceDetails.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceDetails.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceDetails.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceDetails.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceDetailsSIChangeEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceDetailsSIChangeEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceDetailsSIChangeEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceDetailsSIChangeEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceFilter.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceFilter.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceFilter.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceFilter.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceIterator.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceIterator.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceIterator.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceIterator.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceIteratorImpl.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceIteratorImpl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceIteratorImpl.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceIteratorImpl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceList.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceList.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceList.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceList.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceListImpl.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceListImpl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceListImpl.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceListImpl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceProviderInformation.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceProviderInformation.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceProviderInformation.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceProviderInformation.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceTypeFilter.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceTypeFilter.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceTypeFilter.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/ServiceTypeFilter.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/SortNotAvailableException.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/SortNotAvailableException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/SortNotAvailableException.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/SortNotAvailableException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/StreamType.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/StreamType.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/navigation/StreamType.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/navigation/StreamType.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/selection/AlternativeContentEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/selection/AlternativeContentEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/selection/AlternativeContentEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/selection/AlternativeContentEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/selection/InsufficientResourcesException.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/selection/InsufficientResourcesException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/selection/InsufficientResourcesException.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/selection/InsufficientResourcesException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/selection/InvalidServiceComponentException.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/selection/InvalidServiceComponentException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/selection/InvalidServiceComponentException.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/selection/InvalidServiceComponentException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/selection/NormalContentEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/selection/NormalContentEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/selection/NormalContentEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/selection/NormalContentEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/selection/PresentationChangedEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/selection/PresentationChangedEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/selection/PresentationChangedEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/selection/PresentationChangedEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/selection/PresentationTerminatedEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/selection/PresentationTerminatedEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/selection/PresentationTerminatedEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/selection/PresentationTerminatedEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/selection/SelectPermission.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/selection/SelectPermission.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/selection/SelectPermission.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/selection/SelectPermission.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/selection/SelectionFailedEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/selection/SelectionFailedEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/selection/SelectionFailedEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/selection/SelectionFailedEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/selection/ServiceContentHandler.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/selection/ServiceContentHandler.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/selection/ServiceContentHandler.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/selection/ServiceContentHandler.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/selection/ServiceContext.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/selection/ServiceContext.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/selection/ServiceContext.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/selection/ServiceContext.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/selection/ServiceContextDestroyedEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/selection/ServiceContextDestroyedEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/selection/ServiceContextDestroyedEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/selection/ServiceContextDestroyedEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/selection/ServiceContextEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/selection/ServiceContextEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/selection/ServiceContextEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/selection/ServiceContextEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/selection/ServiceContextException.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/selection/ServiceContextException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/selection/ServiceContextException.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/selection/ServiceContextException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/selection/ServiceContextFactory.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/selection/ServiceContextFactory.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/selection/ServiceContextFactory.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/selection/ServiceContextFactory.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/selection/ServiceContextFactoryImpl.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/selection/ServiceContextFactoryImpl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/selection/ServiceContextFactoryImpl.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/selection/ServiceContextFactoryImpl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/selection/ServiceContextListener.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/selection/ServiceContextListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/selection/ServiceContextListener.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/selection/ServiceContextListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/selection/ServiceContextPermission.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/selection/ServiceContextPermission.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/selection/ServiceContextPermission.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/selection/ServiceContextPermission.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/selection/ServiceMediaHandler.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/selection/ServiceMediaHandler.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/selection/ServiceMediaHandler.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/selection/ServiceMediaHandler.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/transport/Bouquet.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/transport/Bouquet.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/transport/Bouquet.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/transport/Bouquet.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/transport/BouquetChangeEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/transport/BouquetChangeEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/transport/BouquetChangeEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/transport/BouquetChangeEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/transport/BouquetChangeListener.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/transport/BouquetChangeListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/transport/BouquetChangeListener.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/transport/BouquetChangeListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/transport/BouquetCollection.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/transport/BouquetCollection.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/transport/BouquetCollection.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/transport/BouquetCollection.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/transport/Network.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/transport/Network.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/transport/Network.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/transport/Network.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/transport/NetworkChangeEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/transport/NetworkChangeEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/transport/NetworkChangeEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/transport/NetworkChangeEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/transport/NetworkChangeListener.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/transport/NetworkChangeListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/transport/NetworkChangeListener.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/transport/NetworkChangeListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/transport/NetworkCollection.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/transport/NetworkCollection.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/transport/NetworkCollection.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/transport/NetworkCollection.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/transport/ServiceDetailsChangeEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/transport/ServiceDetailsChangeEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/transport/ServiceDetailsChangeEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/transport/ServiceDetailsChangeEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/transport/ServiceDetailsChangeListener.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/transport/ServiceDetailsChangeListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/transport/ServiceDetailsChangeListener.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/transport/ServiceDetailsChangeListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/transport/Transport.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/transport/Transport.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/transport/Transport.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/transport/Transport.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/transport/TransportImpl.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/transport/TransportImpl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/transport/TransportImpl.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/transport/TransportImpl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/transport/TransportSIChangeEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/transport/TransportSIChangeEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/transport/TransportSIChangeEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/transport/TransportSIChangeEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/transport/TransportStream.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/transport/TransportStream.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/transport/TransportStream.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/transport/TransportStream.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/transport/TransportStreamChangeEvent.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/transport/TransportStreamChangeEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/transport/TransportStreamChangeEvent.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/transport/TransportStreamChangeEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/transport/TransportStreamChangeListener.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/transport/TransportStreamChangeListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/transport/TransportStreamChangeListener.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/transport/TransportStreamChangeListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/service/transport/TransportStreamCollection.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/service/transport/TransportStreamCollection.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/service/transport/TransportStreamCollection.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/service/transport/TransportStreamCollection.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/xlet/Xlet.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/xlet/Xlet.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/xlet/Xlet.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/xlet/Xlet.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/xlet/XletContext.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/xlet/XletContext.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/xlet/XletContext.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/xlet/XletContext.java diff --git a/mythtv/libs/libmythbluray/bdj/java/javax/tv/xlet/XletStateChangeException.java b/mythtv/external/libmythbluray/bdj/java/javax/tv/xlet/XletStateChangeException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/javax/tv/xlet/XletStateChangeException.java rename to mythtv/external/libmythbluray/bdj/java/javax/tv/xlet/XletStateChangeException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/application/AppAttributes.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/application/AppAttributes.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/application/AppAttributes.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/application/AppAttributes.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/media/AngleChangeEvent.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/media/AngleChangeEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/media/AngleChangeEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/media/AngleChangeEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/media/AngleChangeListener.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/media/AngleChangeListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/media/AngleChangeListener.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/media/AngleChangeListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/media/AngleControl.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/media/AngleControl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/media/AngleControl.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/media/AngleControl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/media/AsynchronousPiPControl.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/media/AsynchronousPiPControl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/media/AsynchronousPiPControl.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/media/AsynchronousPiPControl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/media/AudioControl.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/media/AudioControl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/media/AudioControl.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/media/AudioControl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/media/AudioMetadataControl.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/media/AudioMetadataControl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/media/AudioMetadataControl.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/media/AudioMetadataControl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/media/InvalidAngleException.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/media/InvalidAngleException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/media/InvalidAngleException.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/media/InvalidAngleException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/media/InvalidPlayListException.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/media/InvalidPlayListException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/media/InvalidPlayListException.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/media/InvalidPlayListException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/media/OverallGainControl.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/media/OverallGainControl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/media/OverallGainControl.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/media/OverallGainControl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/media/PanningChangeEvent.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/media/PanningChangeEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/media/PanningChangeEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/media/PanningChangeEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/media/PanningChangeListener.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/media/PanningChangeListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/media/PanningChangeListener.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/media/PanningChangeListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/media/PanningControl.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/media/PanningControl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/media/PanningControl.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/media/PanningControl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/media/PiPControl.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/media/PiPControl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/media/PiPControl.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/media/PiPControl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/media/PiPStatusEvent.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/media/PiPStatusEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/media/PiPStatusEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/media/PiPStatusEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/media/PiPStatusListener.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/media/PiPStatusListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/media/PiPStatusListener.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/media/PiPStatusListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/media/PlayListChangeControl.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/media/PlayListChangeControl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/media/PlayListChangeControl.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/media/PlayListChangeControl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/media/PlaybackControl.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/media/PlaybackControl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/media/PlaybackControl.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/media/PlaybackControl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/media/PlaybackListener.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/media/PlaybackListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/media/PlaybackListener.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/media/PlaybackListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/media/PlaybackMarkEvent.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/media/PlaybackMarkEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/media/PlaybackMarkEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/media/PlaybackMarkEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/media/PlaybackPlayItemEvent.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/media/PlaybackPlayItemEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/media/PlaybackPlayItemEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/media/PlaybackPlayItemEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/media/PrimaryAudioControl.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/media/PrimaryAudioControl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/media/PrimaryAudioControl.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/media/PrimaryAudioControl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/media/PrimaryGainControl.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/media/PrimaryGainControl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/media/PrimaryGainControl.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/media/PrimaryGainControl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/media/SecondaryAudioControl.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/media/SecondaryAudioControl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/media/SecondaryAudioControl.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/media/SecondaryAudioControl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/media/SecondaryGainControl.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/media/SecondaryGainControl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/media/SecondaryGainControl.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/media/SecondaryGainControl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/media/StreamNotAvailableException.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/media/StreamNotAvailableException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/media/StreamNotAvailableException.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/media/StreamNotAvailableException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/media/SubtitleStyleNotAvailableException.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/media/SubtitleStyleNotAvailableException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/media/SubtitleStyleNotAvailableException.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/media/SubtitleStyleNotAvailableException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/media/SubtitlingControl.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/media/SubtitlingControl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/media/SubtitlingControl.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/media/SubtitlingControl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/media/TextSubtitleNotAvailableException.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/media/TextSubtitleNotAvailableException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/media/TextSubtitleNotAvailableException.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/media/TextSubtitleNotAvailableException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/media/UOMaskTableChangedEvent.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/media/UOMaskTableChangedEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/media/UOMaskTableChangedEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/media/UOMaskTableChangedEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/media/UOMaskTableControl.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/media/UOMaskTableControl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/media/UOMaskTableControl.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/media/UOMaskTableControl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/media/UOMaskTableListener.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/media/UOMaskTableListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/media/UOMaskTableListener.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/media/UOMaskTableListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/media/UOMaskedEvent.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/media/UOMaskedEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/media/UOMaskedEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/media/UOMaskedEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/net/BDLocator.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/net/BDLocator.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/net/BDLocator.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/net/BDLocator.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/storage/BindingunitDataAreaInfo.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/storage/BindingunitDataAreaInfo.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/storage/BindingunitDataAreaInfo.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/storage/BindingunitDataAreaInfo.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/storage/DataAreaInfo.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/storage/DataAreaInfo.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/storage/DataAreaInfo.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/storage/DataAreaInfo.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/storage/PersistentDataAreaInfo.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/storage/PersistentDataAreaInfo.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/storage/PersistentDataAreaInfo.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/storage/PersistentDataAreaInfo.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/storage/StorageManager.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/storage/StorageManager.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/storage/StorageManager.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/storage/StorageManager.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/system/RegisterAccess.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/system/RegisterAccess.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/system/RegisterAccess.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/system/RegisterAccess.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/CodingType.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/ti/CodingType.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/CodingType.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/ti/CodingType.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/DeliverySystemType.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/ti/DeliverySystemType.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/DeliverySystemType.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/ti/DeliverySystemType.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/Disc.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/ti/Disc.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/Disc.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/ti/Disc.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/DiscEjectedEvent.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/ti/DiscEjectedEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/DiscEjectedEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/ti/DiscEjectedEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/DiscImpl.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/ti/DiscImpl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/DiscImpl.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/ti/DiscImpl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/DiscInsertedEvent.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/ti/DiscInsertedEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/DiscInsertedEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/ti/DiscInsertedEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/DiscManager.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/ti/DiscManager.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/DiscManager.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/ti/DiscManager.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/DiscStatusEvent.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/ti/DiscStatusEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/DiscStatusEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/ti/DiscStatusEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/DiscStatusListener.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/ti/DiscStatusListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/DiscStatusListener.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/ti/DiscStatusListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/PlayItem.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/ti/PlayItem.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/PlayItem.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/ti/PlayItem.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/PlayItemImpl.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/ti/PlayItemImpl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/PlayItemImpl.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/ti/PlayItemImpl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/PlayList.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/ti/PlayList.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/PlayList.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/ti/PlayList.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/PlayListImpl.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/ti/PlayListImpl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/PlayListImpl.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/ti/PlayListImpl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/StreamType.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/ti/StreamType.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/StreamType.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/ti/StreamType.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/Title.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/ti/Title.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/Title.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/ti/Title.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/TitleComponent.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/ti/TitleComponent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/TitleComponent.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/ti/TitleComponent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/TitleComponentImpl.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/ti/TitleComponentImpl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/TitleComponentImpl.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/ti/TitleComponentImpl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/TitleImpl.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/ti/TitleImpl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/TitleImpl.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/ti/TitleImpl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/TitleInformationType.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/ti/TitleInformationType.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/TitleInformationType.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/ti/TitleInformationType.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/TitleType.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/ti/TitleType.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/TitleType.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/ti/TitleType.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/selection/TitleContext.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/ti/selection/TitleContext.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/selection/TitleContext.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/ti/selection/TitleContext.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/selection/TitleContextImpl.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/ti/selection/TitleContextImpl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/ti/selection/TitleContextImpl.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/ti/selection/TitleContextImpl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/ui/AnimationParameters.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/ui/AnimationParameters.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/ui/AnimationParameters.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/ui/AnimationParameters.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/ui/BDVideoConfigTemplate.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/ui/BDVideoConfigTemplate.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/ui/BDVideoConfigTemplate.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/ui/BDVideoConfigTemplate.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/ui/DeviceConfigurations.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/ui/DeviceConfigurations.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/ui/DeviceConfigurations.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/ui/DeviceConfigurations.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/ui/FrameAccurateAnimation.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/ui/FrameAccurateAnimation.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/ui/FrameAccurateAnimation.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/ui/FrameAccurateAnimation.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/ui/FrameAccurateAnimationTimer.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/ui/FrameAccurateAnimationTimer.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/ui/FrameAccurateAnimationTimer.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/ui/FrameAccurateAnimationTimer.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/ui/ImageFrameAccurateAnimation.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/ui/ImageFrameAccurateAnimation.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/ui/ImageFrameAccurateAnimation.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/ui/ImageFrameAccurateAnimation.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/ui/SyncFrameAccurateAnimation.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/ui/SyncFrameAccurateAnimation.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/ui/SyncFrameAccurateAnimation.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/ui/SyncFrameAccurateAnimation.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/ui/event/HRcEvent.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/ui/event/HRcEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/ui/event/HRcEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/ui/event/HRcEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/vfs/PreparingFailedException.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/vfs/PreparingFailedException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/vfs/PreparingFailedException.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/vfs/PreparingFailedException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/vfs/VFSManager.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/vfs/VFSManager.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/vfs/VFSManager.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/vfs/VFSManager.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/bluray/vfs/VFSPermission.java b/mythtv/external/libmythbluray/bdj/java/org/bluray/vfs/VFSPermission.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/bluray/vfs/VFSPermission.java rename to mythtv/external/libmythbluray/bdj/java/org/bluray/vfs/VFSPermission.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/davic/media/AudioLanguageControl.java b/mythtv/external/libmythbluray/bdj/java/org/davic/media/AudioLanguageControl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/davic/media/AudioLanguageControl.java rename to mythtv/external/libmythbluray/bdj/java/org/davic/media/AudioLanguageControl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/davic/media/FreezeControl.java b/mythtv/external/libmythbluray/bdj/java/org/davic/media/FreezeControl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/davic/media/FreezeControl.java rename to mythtv/external/libmythbluray/bdj/java/org/davic/media/FreezeControl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/davic/media/LanguageControl.java b/mythtv/external/libmythbluray/bdj/java/org/davic/media/LanguageControl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/davic/media/LanguageControl.java rename to mythtv/external/libmythbluray/bdj/java/org/davic/media/LanguageControl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/davic/media/LanguageNotAvailableException.java b/mythtv/external/libmythbluray/bdj/java/org/davic/media/LanguageNotAvailableException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/davic/media/LanguageNotAvailableException.java rename to mythtv/external/libmythbluray/bdj/java/org/davic/media/LanguageNotAvailableException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/davic/media/MediaFreezeException.java b/mythtv/external/libmythbluray/bdj/java/org/davic/media/MediaFreezeException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/davic/media/MediaFreezeException.java rename to mythtv/external/libmythbluray/bdj/java/org/davic/media/MediaFreezeException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/davic/media/MediaLocator.java b/mythtv/external/libmythbluray/bdj/java/org/davic/media/MediaLocator.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/davic/media/MediaLocator.java rename to mythtv/external/libmythbluray/bdj/java/org/davic/media/MediaLocator.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/davic/media/MediaPresentedEvent.java b/mythtv/external/libmythbluray/bdj/java/org/davic/media/MediaPresentedEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/davic/media/MediaPresentedEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/davic/media/MediaPresentedEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/davic/media/MediaTimeEvent.java b/mythtv/external/libmythbluray/bdj/java/org/davic/media/MediaTimeEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/davic/media/MediaTimeEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/davic/media/MediaTimeEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/davic/media/MediaTimeEventControl.java b/mythtv/external/libmythbluray/bdj/java/org/davic/media/MediaTimeEventControl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/davic/media/MediaTimeEventControl.java rename to mythtv/external/libmythbluray/bdj/java/org/davic/media/MediaTimeEventControl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/davic/media/MediaTimeEventListener.java b/mythtv/external/libmythbluray/bdj/java/org/davic/media/MediaTimeEventListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/davic/media/MediaTimeEventListener.java rename to mythtv/external/libmythbluray/bdj/java/org/davic/media/MediaTimeEventListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/davic/media/MediaTimePositionChangedEvent.java b/mythtv/external/libmythbluray/bdj/java/org/davic/media/MediaTimePositionChangedEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/davic/media/MediaTimePositionChangedEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/davic/media/MediaTimePositionChangedEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/davic/media/MediaTimePositionControl.java b/mythtv/external/libmythbluray/bdj/java/org/davic/media/MediaTimePositionControl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/davic/media/MediaTimePositionControl.java rename to mythtv/external/libmythbluray/bdj/java/org/davic/media/MediaTimePositionControl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/davic/media/NotAuthorizedException.java b/mythtv/external/libmythbluray/bdj/java/org/davic/media/NotAuthorizedException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/davic/media/NotAuthorizedException.java rename to mythtv/external/libmythbluray/bdj/java/org/davic/media/NotAuthorizedException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/davic/media/ResourceReturnedEvent.java b/mythtv/external/libmythbluray/bdj/java/org/davic/media/ResourceReturnedEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/davic/media/ResourceReturnedEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/davic/media/ResourceReturnedEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/davic/media/ResourceWithdrawnEvent.java b/mythtv/external/libmythbluray/bdj/java/org/davic/media/ResourceWithdrawnEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/davic/media/ResourceWithdrawnEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/davic/media/ResourceWithdrawnEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/davic/media/SubtitlingLanguageControl.java b/mythtv/external/libmythbluray/bdj/java/org/davic/media/SubtitlingLanguageControl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/davic/media/SubtitlingLanguageControl.java rename to mythtv/external/libmythbluray/bdj/java/org/davic/media/SubtitlingLanguageControl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/davic/mpeg/NotAuthorizedException.java b/mythtv/external/libmythbluray/bdj/java/org/davic/mpeg/NotAuthorizedException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/davic/mpeg/NotAuthorizedException.java rename to mythtv/external/libmythbluray/bdj/java/org/davic/mpeg/NotAuthorizedException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/davic/mpeg/NotAuthorizedInterface.java b/mythtv/external/libmythbluray/bdj/java/org/davic/mpeg/NotAuthorizedInterface.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/davic/mpeg/NotAuthorizedInterface.java rename to mythtv/external/libmythbluray/bdj/java/org/davic/mpeg/NotAuthorizedInterface.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/davic/net/InvalidLocatorException.java b/mythtv/external/libmythbluray/bdj/java/org/davic/net/InvalidLocatorException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/davic/net/InvalidLocatorException.java rename to mythtv/external/libmythbluray/bdj/java/org/davic/net/InvalidLocatorException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/davic/net/Locator.java b/mythtv/external/libmythbluray/bdj/java/org/davic/net/Locator.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/davic/net/Locator.java rename to mythtv/external/libmythbluray/bdj/java/org/davic/net/Locator.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/davic/net/TransportDependentLocator.java b/mythtv/external/libmythbluray/bdj/java/org/davic/net/TransportDependentLocator.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/davic/net/TransportDependentLocator.java rename to mythtv/external/libmythbluray/bdj/java/org/davic/net/TransportDependentLocator.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/davic/resources/ResourceClient.java b/mythtv/external/libmythbluray/bdj/java/org/davic/resources/ResourceClient.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/davic/resources/ResourceClient.java rename to mythtv/external/libmythbluray/bdj/java/org/davic/resources/ResourceClient.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/davic/resources/ResourceProxy.java b/mythtv/external/libmythbluray/bdj/java/org/davic/resources/ResourceProxy.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/davic/resources/ResourceProxy.java rename to mythtv/external/libmythbluray/bdj/java/org/davic/resources/ResourceProxy.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/davic/resources/ResourceServer.java b/mythtv/external/libmythbluray/bdj/java/org/davic/resources/ResourceServer.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/davic/resources/ResourceServer.java rename to mythtv/external/libmythbluray/bdj/java/org/davic/resources/ResourceServer.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/davic/resources/ResourceStatusEvent.java b/mythtv/external/libmythbluray/bdj/java/org/davic/resources/ResourceStatusEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/davic/resources/ResourceStatusEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/davic/resources/ResourceStatusEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/davic/resources/ResourceStatusListener.java b/mythtv/external/libmythbluray/bdj/java/org/davic/resources/ResourceStatusListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/davic/resources/ResourceStatusListener.java rename to mythtv/external/libmythbluray/bdj/java/org/davic/resources/ResourceStatusListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/application/AppAttributes.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/application/AppAttributes.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/application/AppAttributes.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/application/AppAttributes.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/application/AppID.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/application/AppID.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/application/AppID.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/application/AppID.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/application/AppIcon.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/application/AppIcon.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/application/AppIcon.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/application/AppIcon.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/application/AppProxy.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/application/AppProxy.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/application/AppProxy.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/application/AppProxy.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/application/AppStateChangeEvent.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/application/AppStateChangeEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/application/AppStateChangeEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/application/AppStateChangeEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/application/AppStateChangeEventListener.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/application/AppStateChangeEventListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/application/AppStateChangeEventListener.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/application/AppStateChangeEventListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/application/AppsControlPermission.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/application/AppsControlPermission.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/application/AppsControlPermission.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/application/AppsControlPermission.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/application/AppsDatabase.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/application/AppsDatabase.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/application/AppsDatabase.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/application/AppsDatabase.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/application/AppsDatabaseEvent.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/application/AppsDatabaseEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/application/AppsDatabaseEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/application/AppsDatabaseEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/application/AppsDatabaseEventListener.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/application/AppsDatabaseEventListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/application/AppsDatabaseEventListener.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/application/AppsDatabaseEventListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/application/AppsDatabaseFilter.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/application/AppsDatabaseFilter.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/application/AppsDatabaseFilter.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/application/AppsDatabaseFilter.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/application/CurrentServiceFilter.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/application/CurrentServiceFilter.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/application/CurrentServiceFilter.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/application/CurrentServiceFilter.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/application/DVBHTMLProxy.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/application/DVBHTMLProxy.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/application/DVBHTMLProxy.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/application/DVBHTMLProxy.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/application/DVBJProxy.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/application/DVBJProxy.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/application/DVBJProxy.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/application/DVBJProxy.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/application/IllegalProfileParameterException.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/application/IllegalProfileParameterException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/application/IllegalProfileParameterException.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/application/IllegalProfileParameterException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/application/LanguageNotAvailableException.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/application/LanguageNotAvailableException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/application/LanguageNotAvailableException.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/application/LanguageNotAvailableException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/application/RunningApplicationsFilter.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/application/RunningApplicationsFilter.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/application/RunningApplicationsFilter.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/application/RunningApplicationsFilter.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/AsynchronousLoadingEvent.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/AsynchronousLoadingEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/AsynchronousLoadingEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/AsynchronousLoadingEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/AsynchronousLoadingEventListener.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/AsynchronousLoadingEventListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/AsynchronousLoadingEventListener.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/AsynchronousLoadingEventListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/DSMCCException.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/DSMCCException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/DSMCCException.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/DSMCCException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/DSMCCObject.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/DSMCCObject.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/DSMCCObject.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/DSMCCObject.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/DSMCCStream.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/DSMCCStream.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/DSMCCStream.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/DSMCCStream.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/DSMCCStreamEvent.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/DSMCCStreamEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/DSMCCStreamEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/DSMCCStreamEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/IllegalObjectTypeException.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/IllegalObjectTypeException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/IllegalObjectTypeException.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/IllegalObjectTypeException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/InsufficientResourcesEvent.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/InsufficientResourcesEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/InsufficientResourcesEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/InsufficientResourcesEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/InsufficientResourcesException.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/InsufficientResourcesException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/InsufficientResourcesException.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/InsufficientResourcesException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/InvalidAddressException.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/InvalidAddressException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/InvalidAddressException.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/InvalidAddressException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/InvalidFormatEvent.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/InvalidFormatEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/InvalidFormatEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/InvalidFormatEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/InvalidFormatException.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/InvalidFormatException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/InvalidFormatException.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/InvalidFormatException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/InvalidPathNameException.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/InvalidPathNameException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/InvalidPathNameException.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/InvalidPathNameException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/InvalidPathnameEvent.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/InvalidPathnameEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/InvalidPathnameEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/InvalidPathnameEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/LoadingAbortedEvent.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/LoadingAbortedEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/LoadingAbortedEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/LoadingAbortedEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/MPEGDeliveryErrorEvent.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/MPEGDeliveryErrorEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/MPEGDeliveryErrorEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/MPEGDeliveryErrorEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/MPEGDeliveryException.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/MPEGDeliveryException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/MPEGDeliveryException.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/MPEGDeliveryException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/NPTDiscontinuityEvent.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/NPTDiscontinuityEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/NPTDiscontinuityEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/NPTDiscontinuityEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/NPTListener.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/NPTListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/NPTListener.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/NPTListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/NPTPresentEvent.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/NPTPresentEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/NPTPresentEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/NPTPresentEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/NPTRate.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/NPTRate.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/NPTRate.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/NPTRate.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/NPTRateChangeEvent.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/NPTRateChangeEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/NPTRateChangeEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/NPTRateChangeEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/NPTRemovedEvent.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/NPTRemovedEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/NPTRemovedEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/NPTRemovedEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/NPTStatusEvent.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/NPTStatusEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/NPTStatusEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/NPTStatusEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/NotEntitledEvent.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/NotEntitledEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/NotEntitledEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/NotEntitledEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/NotEntitledException.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/NotEntitledException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/NotEntitledException.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/NotEntitledException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/NotLoadedException.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/NotLoadedException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/NotLoadedException.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/NotLoadedException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/NothingToAbortException.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/NothingToAbortException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/NothingToAbortException.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/NothingToAbortException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/ObjectChangeEvent.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/ObjectChangeEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/ObjectChangeEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/ObjectChangeEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/ObjectChangeEventListener.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/ObjectChangeEventListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/ObjectChangeEventListener.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/ObjectChangeEventListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/ServerDeliveryErrorEvent.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/ServerDeliveryErrorEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/ServerDeliveryErrorEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/ServerDeliveryErrorEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/ServerDeliveryException.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/ServerDeliveryException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/ServerDeliveryException.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/ServerDeliveryException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/ServiceDomain.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/ServiceDomain.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/ServiceDomain.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/ServiceDomain.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/ServiceXFRErrorEvent.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/ServiceXFRErrorEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/ServiceXFRErrorEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/ServiceXFRErrorEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/ServiceXFRException.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/ServiceXFRException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/ServiceXFRException.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/ServiceXFRException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/ServiceXFRReference.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/ServiceXFRReference.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/ServiceXFRReference.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/ServiceXFRReference.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/StreamEvent.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/StreamEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/StreamEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/StreamEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/StreamEventListener.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/StreamEventListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/StreamEventListener.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/StreamEventListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/SuccessEvent.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/SuccessEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/SuccessEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/SuccessEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/UnknownEventException.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/UnknownEventException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/dsmcc/UnknownEventException.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/dsmcc/UnknownEventException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/event/EventManager.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/event/EventManager.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/event/EventManager.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/event/EventManager.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/event/OverallRepository.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/event/OverallRepository.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/event/OverallRepository.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/event/OverallRepository.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/event/RepositoryDescriptor.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/event/RepositoryDescriptor.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/event/RepositoryDescriptor.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/event/RepositoryDescriptor.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/event/UserEvent.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/event/UserEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/event/UserEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/event/UserEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/event/UserEventAvailableEvent.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/event/UserEventAvailableEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/event/UserEventAvailableEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/event/UserEventAvailableEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/event/UserEventListener.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/event/UserEventListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/event/UserEventListener.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/event/UserEventListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/event/UserEventRepository.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/event/UserEventRepository.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/event/UserEventRepository.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/event/UserEventRepository.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/event/UserEventUnavailableEvent.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/event/UserEventUnavailableEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/event/UserEventUnavailableEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/event/UserEventUnavailableEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/io/ixc/IxcRegistry.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/io/ixc/IxcRegistry.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/io/ixc/IxcRegistry.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/io/ixc/IxcRegistry.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/io/persistent/FileAccessPermissions.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/io/persistent/FileAccessPermissions.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/io/persistent/FileAccessPermissions.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/io/persistent/FileAccessPermissions.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/io/persistent/FileAttributes.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/io/persistent/FileAttributes.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/io/persistent/FileAttributes.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/io/persistent/FileAttributes.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/lang/DVBClassLoader.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/lang/DVBClassLoader.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/lang/DVBClassLoader.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/lang/DVBClassLoader.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/lang/DVBClassLoaderImpl.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/lang/DVBClassLoaderImpl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/lang/DVBClassLoaderImpl.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/lang/DVBClassLoaderImpl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/media/ActiveFormatDescriptionChangedEvent.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/media/ActiveFormatDescriptionChangedEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/media/ActiveFormatDescriptionChangedEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/media/ActiveFormatDescriptionChangedEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/media/AspectRatioChangedEvent.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/media/AspectRatioChangedEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/media/AspectRatioChangedEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/media/AspectRatioChangedEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/media/BackgroundVideoPresentationControl.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/media/BackgroundVideoPresentationControl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/media/BackgroundVideoPresentationControl.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/media/BackgroundVideoPresentationControl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/media/CAException.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/media/CAException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/media/CAException.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/media/CAException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/media/CAStopEvent.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/media/CAStopEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/media/CAStopEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/media/CAStopEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/media/DFCChangedEvent.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/media/DFCChangedEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/media/DFCChangedEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/media/DFCChangedEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/media/DVBMediaSelectControl.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/media/DVBMediaSelectControl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/media/DVBMediaSelectControl.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/media/DVBMediaSelectControl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/media/DripFeedDataSource.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/media/DripFeedDataSource.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/media/DripFeedDataSource.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/media/DripFeedDataSource.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/media/DripFeedPermission.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/media/DripFeedPermission.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/media/DripFeedPermission.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/media/DripFeedPermission.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/media/NoComponentSelectedEvent.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/media/NoComponentSelectedEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/media/NoComponentSelectedEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/media/NoComponentSelectedEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/media/PresentationChangedEvent.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/media/PresentationChangedEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/media/PresentationChangedEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/media/PresentationChangedEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/media/ServiceRemovedEvent.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/media/ServiceRemovedEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/media/ServiceRemovedEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/media/ServiceRemovedEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/media/StopByResourceLossEvent.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/media/StopByResourceLossEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/media/StopByResourceLossEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/media/StopByResourceLossEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/media/SubtitleAvailableEvent.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/media/SubtitleAvailableEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/media/SubtitleAvailableEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/media/SubtitleAvailableEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/media/SubtitleListener.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/media/SubtitleListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/media/SubtitleListener.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/media/SubtitleListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/media/SubtitleNotAvailableEvent.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/media/SubtitleNotAvailableEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/media/SubtitleNotAvailableEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/media/SubtitleNotAvailableEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/media/SubtitleNotSelectedEvent.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/media/SubtitleNotSelectedEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/media/SubtitleNotSelectedEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/media/SubtitleNotSelectedEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/media/SubtitleSelectedEvent.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/media/SubtitleSelectedEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/media/SubtitleSelectedEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/media/SubtitleSelectedEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/media/SubtitlingEventControl.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/media/SubtitlingEventControl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/media/SubtitlingEventControl.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/media/SubtitlingEventControl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/media/VideoFormatControl.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/media/VideoFormatControl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/media/VideoFormatControl.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/media/VideoFormatControl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/media/VideoFormatEvent.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/media/VideoFormatEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/media/VideoFormatEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/media/VideoFormatEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/media/VideoFormatListener.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/media/VideoFormatListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/media/VideoFormatListener.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/media/VideoFormatListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/media/VideoPresentationControl.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/media/VideoPresentationControl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/media/VideoPresentationControl.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/media/VideoPresentationControl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/media/VideoTransformation.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/media/VideoTransformation.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/media/VideoTransformation.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/media/VideoTransformation.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/test/DVBTest.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/test/DVBTest.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/test/DVBTest.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/test/DVBTest.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/ui/DVBAlphaComposite.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/ui/DVBAlphaComposite.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/ui/DVBAlphaComposite.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/ui/DVBAlphaComposite.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/ui/DVBBufferedImage.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/ui/DVBBufferedImage.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/ui/DVBBufferedImage.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/ui/DVBBufferedImage.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/ui/DVBColor.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/ui/DVBColor.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/ui/DVBColor.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/ui/DVBColor.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/ui/DVBGraphics.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/ui/DVBGraphics.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/ui/DVBGraphics.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/ui/DVBGraphics.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/ui/DVBGraphicsImpl.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/ui/DVBGraphicsImpl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/ui/DVBGraphicsImpl.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/ui/DVBGraphicsImpl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/ui/DVBRasterFormatException.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/ui/DVBRasterFormatException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/ui/DVBRasterFormatException.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/ui/DVBRasterFormatException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/ui/DVBTextLayoutManager.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/ui/DVBTextLayoutManager.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/ui/DVBTextLayoutManager.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/ui/DVBTextLayoutManager.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/ui/FontFactory.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/ui/FontFactory.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/ui/FontFactory.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/ui/FontFactory.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/ui/FontFormatException.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/ui/FontFormatException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/ui/FontFormatException.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/ui/FontFormatException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/ui/FontNotAvailableException.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/ui/FontNotAvailableException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/ui/FontNotAvailableException.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/ui/FontNotAvailableException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/ui/TestOpacity.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/ui/TestOpacity.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/ui/TestOpacity.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/ui/TestOpacity.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/ui/TextOverflowListener.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/ui/TextOverflowListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/ui/TextOverflowListener.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/ui/TextOverflowListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/ui/UnsupportedDrawingOperationException.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/ui/UnsupportedDrawingOperationException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/ui/UnsupportedDrawingOperationException.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/ui/UnsupportedDrawingOperationException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/user/Facility.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/user/Facility.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/user/Facility.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/user/Facility.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/user/GeneralPreference.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/user/GeneralPreference.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/user/GeneralPreference.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/user/GeneralPreference.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/user/Preference.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/user/Preference.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/user/Preference.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/user/Preference.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/user/UnsupportedPreferenceException.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/user/UnsupportedPreferenceException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/user/UnsupportedPreferenceException.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/user/UnsupportedPreferenceException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/user/UserPreferenceChangeEvent.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/user/UserPreferenceChangeEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/user/UserPreferenceChangeEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/user/UserPreferenceChangeEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/user/UserPreferenceChangeListener.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/user/UserPreferenceChangeListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/user/UserPreferenceChangeListener.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/user/UserPreferenceChangeListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/user/UserPreferenceManager.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/user/UserPreferenceManager.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/user/UserPreferenceManager.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/user/UserPreferenceManager.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/dvb/user/UserPreferencePermission.java b/mythtv/external/libmythbluray/bdj/java/org/dvb/user/UserPreferencePermission.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/dvb/user/UserPreferencePermission.java rename to mythtv/external/libmythbluray/bdj/java/org/dvb/user/UserPreferencePermission.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HActionInputPreferred.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HActionInputPreferred.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HActionInputPreferred.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HActionInputPreferred.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HActionable.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HActionable.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HActionable.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HActionable.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HAdjustableLook.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HAdjustableLook.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HAdjustableLook.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HAdjustableLook.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HAdjustmentInputPreferred.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HAdjustmentInputPreferred.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HAdjustmentInputPreferred.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HAdjustmentInputPreferred.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HAdjustmentValue.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HAdjustmentValue.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HAdjustmentValue.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HAdjustmentValue.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HAnimateEffect.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HAnimateEffect.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HAnimateEffect.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HAnimateEffect.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HAnimateLook.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HAnimateLook.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HAnimateLook.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HAnimateLook.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HAnimation.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HAnimation.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HAnimation.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HAnimation.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HBackgroundConfigTemplate.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HBackgroundConfigTemplate.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HBackgroundConfigTemplate.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HBackgroundConfigTemplate.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HBackgroundConfiguration.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HBackgroundConfiguration.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HBackgroundConfiguration.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HBackgroundConfiguration.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HBackgroundDevice.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HBackgroundDevice.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HBackgroundDevice.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HBackgroundDevice.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HBackgroundImage.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HBackgroundImage.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HBackgroundImage.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HBackgroundImage.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HChangeData.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HChangeData.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HChangeData.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HChangeData.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HComponent.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HComponent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HComponent.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HComponent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HComponentOrdering.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HComponentOrdering.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HComponentOrdering.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HComponentOrdering.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HConfigurationException.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HConfigurationException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HConfigurationException.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HConfigurationException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HContainer.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HContainer.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HContainer.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HContainer.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HDefaultTextLayoutManager.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HDefaultTextLayoutManager.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HDefaultTextLayoutManager.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HDefaultTextLayoutManager.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HEmulatedGraphicsConfiguration.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HEmulatedGraphicsConfiguration.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HEmulatedGraphicsConfiguration.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HEmulatedGraphicsConfiguration.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HEmulatedGraphicsDevice.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HEmulatedGraphicsDevice.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HEmulatedGraphicsDevice.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HEmulatedGraphicsDevice.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HEventMulticaster.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HEventMulticaster.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HEventMulticaster.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HEventMulticaster.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HExtendedLook.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HExtendedLook.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HExtendedLook.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HExtendedLook.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HFlatEffectMatte.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HFlatEffectMatte.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HFlatEffectMatte.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HFlatEffectMatte.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HFlatMatte.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HFlatMatte.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HFlatMatte.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HFlatMatte.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HFontCapabilities.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HFontCapabilities.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HFontCapabilities.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HFontCapabilities.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HGraphicButton.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HGraphicButton.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HGraphicButton.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HGraphicButton.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HGraphicLook.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HGraphicLook.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HGraphicLook.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HGraphicLook.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HGraphicsConfigTemplate.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HGraphicsConfigTemplate.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HGraphicsConfigTemplate.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HGraphicsConfigTemplate.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HGraphicsConfiguration.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HGraphicsConfiguration.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HGraphicsConfiguration.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HGraphicsConfiguration.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HGraphicsDevice.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HGraphicsDevice.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HGraphicsDevice.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HGraphicsDevice.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HIcon.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HIcon.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HIcon.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HIcon.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HImageEffectMatte.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HImageEffectMatte.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HImageEffectMatte.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HImageEffectMatte.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HImageHints.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HImageHints.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HImageHints.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HImageHints.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HImageMatte.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HImageMatte.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HImageMatte.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HImageMatte.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HInvalidLookException.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HInvalidLookException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HInvalidLookException.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HInvalidLookException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HItemValue.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HItemValue.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HItemValue.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HItemValue.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HKeyboardInputPreferred.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HKeyboardInputPreferred.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HKeyboardInputPreferred.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HKeyboardInputPreferred.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HListElement.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HListElement.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HListElement.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HListElement.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HListGroup.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HListGroup.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HListGroup.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HListGroup.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HListGroupLook.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HListGroupLook.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HListGroupLook.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HListGroupLook.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HLook.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HLook.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HLook.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HLook.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HMatte.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HMatte.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HMatte.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HMatte.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HMatteException.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HMatteException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HMatteException.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HMatteException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HMatteLayer.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HMatteLayer.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HMatteLayer.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HMatteLayer.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HMultilineEntry.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HMultilineEntry.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HMultilineEntry.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HMultilineEntry.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HMultilineEntryLook.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HMultilineEntryLook.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HMultilineEntryLook.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HMultilineEntryLook.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HNavigable.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HNavigable.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HNavigable.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HNavigable.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HNavigationInputPreferred.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HNavigationInputPreferred.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HNavigationInputPreferred.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HNavigationInputPreferred.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HNoInputPreferred.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HNoInputPreferred.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HNoInputPreferred.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HNoInputPreferred.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HOrientable.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HOrientable.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HOrientable.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HOrientable.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HPermissionDeniedException.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HPermissionDeniedException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HPermissionDeniedException.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HPermissionDeniedException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HRange.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HRange.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HRange.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HRange.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HRangeLook.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HRangeLook.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HRangeLook.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HRangeLook.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HRangeValue.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HRangeValue.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HRangeValue.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HRangeValue.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HScene.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HScene.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HScene.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HScene.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HSceneFactory.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HSceneFactory.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HSceneFactory.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HSceneFactory.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HSceneTemplate.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HSceneTemplate.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HSceneTemplate.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HSceneTemplate.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HScreen.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HScreen.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HScreen.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HScreen.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HScreenConfigTemplate.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HScreenConfigTemplate.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HScreenConfigTemplate.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HScreenConfigTemplate.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HScreenConfiguration.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HScreenConfiguration.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HScreenConfiguration.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HScreenConfiguration.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HScreenDevice.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HScreenDevice.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HScreenDevice.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HScreenDevice.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HScreenDimension.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HScreenDimension.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HScreenDimension.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HScreenDimension.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HScreenPoint.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HScreenPoint.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HScreenPoint.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HScreenPoint.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HScreenRectangle.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HScreenRectangle.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HScreenRectangle.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HScreenRectangle.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HSelectionInputPreferred.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HSelectionInputPreferred.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HSelectionInputPreferred.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HSelectionInputPreferred.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HSinglelineEntry.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HSinglelineEntry.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HSinglelineEntry.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HSinglelineEntry.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HSinglelineEntryLook.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HSinglelineEntryLook.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HSinglelineEntryLook.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HSinglelineEntryLook.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HSound.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HSound.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HSound.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HSound.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HState.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HState.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HState.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HState.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HStaticAnimation.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HStaticAnimation.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HStaticAnimation.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HStaticAnimation.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HStaticIcon.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HStaticIcon.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HStaticIcon.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HStaticIcon.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HStaticRange.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HStaticRange.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HStaticRange.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HStaticRange.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HStaticText.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HStaticText.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HStaticText.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HStaticText.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HStillImageBackgroundConfiguration.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HStillImageBackgroundConfiguration.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HStillImageBackgroundConfiguration.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HStillImageBackgroundConfiguration.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HSwitchable.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HSwitchable.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HSwitchable.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HSwitchable.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HText.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HText.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HText.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HText.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HTextButton.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HTextButton.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HTextButton.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HTextButton.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HTextLayoutManager.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HTextLayoutManager.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HTextLayoutManager.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HTextLayoutManager.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HTextLook.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HTextLook.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HTextLook.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HTextLook.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HTextValue.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HTextValue.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HTextValue.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HTextValue.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HToggleButton.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HToggleButton.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HToggleButton.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HToggleButton.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HToggleGroup.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HToggleGroup.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HToggleGroup.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HToggleGroup.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HUIException.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HUIException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HUIException.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HUIException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HVersion.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HVersion.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HVersion.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HVersion.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HVideoComponent.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HVideoComponent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HVideoComponent.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HVideoComponent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HVideoConfigTemplate.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HVideoConfigTemplate.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HVideoConfigTemplate.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HVideoConfigTemplate.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HVideoConfiguration.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HVideoConfiguration.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HVideoConfiguration.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HVideoConfiguration.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HVideoDevice.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HVideoDevice.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HVideoDevice.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HVideoDevice.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HVisible.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/HVisible.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/HVisible.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/HVisible.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HActionEvent.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HActionEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HActionEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HActionEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HActionListener.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HActionListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HActionListener.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HActionListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HAdjustmentEvent.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HAdjustmentEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HAdjustmentEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HAdjustmentEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HAdjustmentListener.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HAdjustmentListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HAdjustmentListener.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HAdjustmentListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HBackgroundImageEvent.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HBackgroundImageEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HBackgroundImageEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HBackgroundImageEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HBackgroundImageListener.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HBackgroundImageListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HBackgroundImageListener.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HBackgroundImageListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HEventGroup.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HEventGroup.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HEventGroup.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HEventGroup.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HEventRepresentation.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HEventRepresentation.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HEventRepresentation.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HEventRepresentation.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HFocusEvent.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HFocusEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HFocusEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HFocusEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HFocusListener.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HFocusListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HFocusListener.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HFocusListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HItemEvent.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HItemEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HItemEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HItemEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HItemListener.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HItemListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HItemListener.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HItemListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HKeyCapabilities.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HKeyCapabilities.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HKeyCapabilities.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HKeyCapabilities.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HKeyEvent.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HKeyEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HKeyEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HKeyEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HKeyListener.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HKeyListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HKeyListener.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HKeyListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HMouseCapabilities.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HMouseCapabilities.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HMouseCapabilities.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HMouseCapabilities.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HRcCapabilities.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HRcCapabilities.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HRcCapabilities.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HRcCapabilities.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HRcEvent.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HRcEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HRcEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HRcEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HScreenConfigurationEvent.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HScreenConfigurationEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HScreenConfigurationEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HScreenConfigurationEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HScreenConfigurationListener.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HScreenConfigurationListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HScreenConfigurationListener.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HScreenConfigurationListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HScreenDeviceReleasedEvent.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HScreenDeviceReleasedEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HScreenDeviceReleasedEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HScreenDeviceReleasedEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HScreenDeviceReservedEvent.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HScreenDeviceReservedEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HScreenDeviceReservedEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HScreenDeviceReservedEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HScreenLocationModifiedEvent.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HScreenLocationModifiedEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HScreenLocationModifiedEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HScreenLocationModifiedEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HScreenLocationModifiedListener.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HScreenLocationModifiedListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HScreenLocationModifiedListener.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HScreenLocationModifiedListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HTextEvent.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HTextEvent.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HTextEvent.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HTextEvent.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HTextListener.java b/mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HTextListener.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/havi/ui/event/HTextListener.java rename to mythtv/external/libmythbluray/bdj/java/org/havi/ui/event/HTextListener.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/Arrays.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/Arrays.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/Arrays.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/Arrays.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/BDJAction.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/BDJAction.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/BDJAction.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/BDJAction.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/BDJActionManager.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/BDJActionManager.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/BDJActionManager.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/BDJActionManager.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/BDJActionQueue.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/BDJActionQueue.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/BDJActionQueue.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/BDJActionQueue.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/BDJAppProxy.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/BDJAppProxy.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/BDJAppProxy.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/BDJAppProxy.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/BDJAppsDatabase.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/BDJAppsDatabase.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/BDJAppsDatabase.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/BDJAppsDatabase.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/BDJClassLoader.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/BDJClassLoader.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/BDJClassLoader.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/BDJClassLoader.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/BDJException.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/BDJException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/BDJException.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/BDJException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/BDJLoader.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/BDJLoader.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/BDJLoader.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/BDJLoader.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/BDJLoaderCallback.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/BDJLoaderCallback.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/BDJLoaderCallback.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/BDJLoaderCallback.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/BDJThreadGroup.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/BDJThreadGroup.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/BDJThreadGroup.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/BDJThreadGroup.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/BDJUtil.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/BDJUtil.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/BDJUtil.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/BDJUtil.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/BDJXletContext.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/BDJXletContext.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/BDJXletContext.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/BDJXletContext.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/FontIndex.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/FontIndex.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/FontIndex.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/FontIndex.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/FontIndexData.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/FontIndexData.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/FontIndexData.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/FontIndexData.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/GUIManager.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/GUIManager.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/GUIManager.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/GUIManager.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/InputManager.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/InputManager.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/InputManager.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/InputManager.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/Libbluray.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/Libbluray.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/Libbluray.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/Libbluray.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/MountException.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/MountException.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/MountException.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/MountException.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/MountManager.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/MountManager.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/MountManager.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/MountManager.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/PlaylistInfo.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/PlaylistInfo.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/PlaylistInfo.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/PlaylistInfo.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/StrUtil.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/StrUtil.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/StrUtil.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/StrUtil.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/StreamInfo.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/StreamInfo.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/StreamInfo.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/StreamInfo.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/TIClip.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/TIClip.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/TIClip.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/TIClip.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/TIMark.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/TIMark.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/TIMark.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/TIMark.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/TitleInfo.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/TitleInfo.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/TitleInfo.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/TitleInfo.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/bdjo/AppCache.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/bdjo/AppCache.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/bdjo/AppCache.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/bdjo/AppCache.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/bdjo/AppEntry.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/bdjo/AppEntry.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/bdjo/AppEntry.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/bdjo/AppEntry.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/bdjo/AppProfile.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/bdjo/AppProfile.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/bdjo/AppProfile.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/bdjo/AppProfile.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/bdjo/Bdjo.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/bdjo/Bdjo.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/bdjo/Bdjo.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/bdjo/Bdjo.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/bdjo/GraphicsResolution.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/bdjo/GraphicsResolution.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/bdjo/GraphicsResolution.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/bdjo/GraphicsResolution.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/bdjo/PlayListTable.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/bdjo/PlayListTable.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/bdjo/PlayListTable.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/bdjo/PlayListTable.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/bdjo/TerminalInfo.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/bdjo/TerminalInfo.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/bdjo/TerminalInfo.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/bdjo/TerminalInfo.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/BDHandler.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/BDHandler.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/BDHandler.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/BDHandler.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/AngleControlImpl.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/AngleControlImpl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/AngleControlImpl.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/AngleControlImpl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/AudioMetadataControlImpl.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/AudioMetadataControlImpl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/AudioMetadataControlImpl.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/AudioMetadataControlImpl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/BackgroundVideoPresentationControlImpl.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/BackgroundVideoPresentationControlImpl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/BackgroundVideoPresentationControlImpl.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/BackgroundVideoPresentationControlImpl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/DVBMediaSelectControlImpl.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/DVBMediaSelectControlImpl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/DVBMediaSelectControlImpl.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/DVBMediaSelectControlImpl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/Handler.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/Handler.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/Handler.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/Handler.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/MediaTimeEventControlImpl.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/MediaTimeEventControlImpl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/MediaTimeEventControlImpl.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/MediaTimeEventControlImpl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/MediaTimePositionControlImpl.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/MediaTimePositionControlImpl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/MediaTimePositionControlImpl.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/MediaTimePositionControlImpl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/OverallGainControlImpl.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/OverallGainControlImpl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/OverallGainControlImpl.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/OverallGainControlImpl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/PanningControlImpl.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/PanningControlImpl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/PanningControlImpl.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/PanningControlImpl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/PiPControlImpl.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/PiPControlImpl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/PiPControlImpl.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/PiPControlImpl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/PlayListChangeControlImpl.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/PlayListChangeControlImpl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/PlayListChangeControlImpl.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/PlayListChangeControlImpl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/PlaybackControlImpl.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/PlaybackControlImpl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/PlaybackControlImpl.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/PlaybackControlImpl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/PrimaryAudioControlImpl.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/PrimaryAudioControlImpl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/PrimaryAudioControlImpl.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/PrimaryAudioControlImpl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/PrimaryGainControlImpl.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/PrimaryGainControlImpl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/PrimaryGainControlImpl.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/PrimaryGainControlImpl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/SecondaryAudioControlImpl.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/SecondaryAudioControlImpl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/SecondaryAudioControlImpl.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/SecondaryAudioControlImpl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/SecondaryGainControlImpl.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/SecondaryGainControlImpl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/SecondaryGainControlImpl.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/SecondaryGainControlImpl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/StreamControl.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/StreamControl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/StreamControl.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/StreamControl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/SubtitlingControlImpl.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/SubtitlingControlImpl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/SubtitlingControlImpl.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/SubtitlingControlImpl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/UOMaskTableControlImpl.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/UOMaskTableControlImpl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/UOMaskTableControlImpl.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/UOMaskTableControlImpl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/VideoControl.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/VideoControl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/VideoControl.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/VideoControl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/VideoFormatControlImpl.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/VideoFormatControlImpl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/playlist/VideoFormatControlImpl.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/playlist/VideoFormatControlImpl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/sound/Handler.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/sound/Handler.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/sound/Handler.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/sound/Handler.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/sound/MediaTimePositionControlImpl.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/sound/MediaTimePositionControlImpl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/sound/MediaTimePositionControlImpl.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/sound/MediaTimePositionControlImpl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/video/dvb/mpeg/drip/BackgroundVideoPresentationControlImpl.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/video/dvb/mpeg/drip/BackgroundVideoPresentationControlImpl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/video/dvb/mpeg/drip/BackgroundVideoPresentationControlImpl.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/video/dvb/mpeg/drip/BackgroundVideoPresentationControlImpl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/video/dvb/mpeg/drip/Handler.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/video/dvb/mpeg/drip/Handler.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/video/dvb/mpeg/drip/Handler.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/video/dvb/mpeg/drip/Handler.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/video/dvb/mpeg/drip/VideoControl.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/video/dvb/mpeg/drip/VideoControl.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/media/content/video/dvb/mpeg/drip/VideoControl.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/media/content/video/dvb/mpeg/drip/VideoControl.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/media/protocol/bd/DataSource.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/media/protocol/bd/DataSource.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/media/protocol/bd/DataSource.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/media/protocol/bd/DataSource.java diff --git a/mythtv/libs/libmythbluray/bdj/java/org/videolan/media/protocol/dripfeed/DataSource.java b/mythtv/external/libmythbluray/bdj/java/org/videolan/media/protocol/dripfeed/DataSource.java similarity index 100% rename from mythtv/libs/libmythbluray/bdj/java/org/videolan/media/protocol/dripfeed/DataSource.java rename to mythtv/external/libmythbluray/bdj/java/org/videolan/media/protocol/dripfeed/DataSource.java diff --git a/mythtv/libs/libmythbluray/bdj/native/org_videolan_Libbluray.c b/mythtv/external/libmythbluray/bdj/native/org_videolan_Libbluray.c similarity index 100% rename from mythtv/libs/libmythbluray/bdj/native/org_videolan_Libbluray.c rename to mythtv/external/libmythbluray/bdj/native/org_videolan_Libbluray.c diff --git a/mythtv/libs/libmythbluray/bdj/native/org_videolan_Libbluray.h b/mythtv/external/libmythbluray/bdj/native/org_videolan_Libbluray.h similarity index 100% rename from mythtv/libs/libmythbluray/bdj/native/org_videolan_Libbluray.h rename to mythtv/external/libmythbluray/bdj/native/org_videolan_Libbluray.h diff --git a/mythtv/libs/libmythbluray/bdnav/Makefile.am b/mythtv/external/libmythbluray/bdnav/Makefile.am similarity index 100% rename from mythtv/libs/libmythbluray/bdnav/Makefile.am rename to mythtv/external/libmythbluray/bdnav/Makefile.am diff --git a/mythtv/libs/libmythbluray/bdnav/Makefile.in b/mythtv/external/libmythbluray/bdnav/Makefile.in similarity index 100% rename from mythtv/libs/libmythbluray/bdnav/Makefile.in rename to mythtv/external/libmythbluray/bdnav/Makefile.in diff --git a/mythtv/libs/libmythbluray/bdnav/bdid_parse.c b/mythtv/external/libmythbluray/bdnav/bdid_parse.c similarity index 100% rename from mythtv/libs/libmythbluray/bdnav/bdid_parse.c rename to mythtv/external/libmythbluray/bdnav/bdid_parse.c diff --git a/mythtv/libs/libmythbluray/bdnav/bdid_parse.h b/mythtv/external/libmythbluray/bdnav/bdid_parse.h similarity index 100% rename from mythtv/libs/libmythbluray/bdnav/bdid_parse.h rename to mythtv/external/libmythbluray/bdnav/bdid_parse.h diff --git a/mythtv/libs/libmythbluray/bdnav/bdparse.h b/mythtv/external/libmythbluray/bdnav/bdparse.h similarity index 100% rename from mythtv/libs/libmythbluray/bdnav/bdparse.h rename to mythtv/external/libmythbluray/bdnav/bdparse.h diff --git a/mythtv/libs/libmythbluray/bdnav/clpi_data.h b/mythtv/external/libmythbluray/bdnav/clpi_data.h similarity index 100% rename from mythtv/libs/libmythbluray/bdnav/clpi_data.h rename to mythtv/external/libmythbluray/bdnav/clpi_data.h diff --git a/mythtv/libs/libmythbluray/bdnav/clpi_parse.c b/mythtv/external/libmythbluray/bdnav/clpi_parse.c similarity index 100% rename from mythtv/libs/libmythbluray/bdnav/clpi_parse.c rename to mythtv/external/libmythbluray/bdnav/clpi_parse.c diff --git a/mythtv/libs/libmythbluray/bdnav/clpi_parse.h b/mythtv/external/libmythbluray/bdnav/clpi_parse.h similarity index 100% rename from mythtv/libs/libmythbluray/bdnav/clpi_parse.h rename to mythtv/external/libmythbluray/bdnav/clpi_parse.h diff --git a/mythtv/libs/libmythbluray/bdnav/extdata_parse.c b/mythtv/external/libmythbluray/bdnav/extdata_parse.c similarity index 100% rename from mythtv/libs/libmythbluray/bdnav/extdata_parse.c rename to mythtv/external/libmythbluray/bdnav/extdata_parse.c diff --git a/mythtv/libs/libmythbluray/bdnav/extdata_parse.h b/mythtv/external/libmythbluray/bdnav/extdata_parse.h similarity index 100% rename from mythtv/libs/libmythbluray/bdnav/extdata_parse.h rename to mythtv/external/libmythbluray/bdnav/extdata_parse.h diff --git a/mythtv/libs/libmythbluray/bdnav/index_parse.c b/mythtv/external/libmythbluray/bdnav/index_parse.c similarity index 100% rename from mythtv/libs/libmythbluray/bdnav/index_parse.c rename to mythtv/external/libmythbluray/bdnav/index_parse.c diff --git a/mythtv/libs/libmythbluray/bdnav/index_parse.h b/mythtv/external/libmythbluray/bdnav/index_parse.h similarity index 100% rename from mythtv/libs/libmythbluray/bdnav/index_parse.h rename to mythtv/external/libmythbluray/bdnav/index_parse.h diff --git a/mythtv/libs/libmythbluray/bdnav/meta_data.h b/mythtv/external/libmythbluray/bdnav/meta_data.h similarity index 100% rename from mythtv/libs/libmythbluray/bdnav/meta_data.h rename to mythtv/external/libmythbluray/bdnav/meta_data.h diff --git a/mythtv/libs/libmythbluray/bdnav/meta_parse.c b/mythtv/external/libmythbluray/bdnav/meta_parse.c similarity index 100% rename from mythtv/libs/libmythbluray/bdnav/meta_parse.c rename to mythtv/external/libmythbluray/bdnav/meta_parse.c diff --git a/mythtv/libs/libmythbluray/bdnav/meta_parse.h b/mythtv/external/libmythbluray/bdnav/meta_parse.h similarity index 100% rename from mythtv/libs/libmythbluray/bdnav/meta_parse.h rename to mythtv/external/libmythbluray/bdnav/meta_parse.h diff --git a/mythtv/libs/libmythbluray/bdnav/mpls_parse.c b/mythtv/external/libmythbluray/bdnav/mpls_parse.c similarity index 100% rename from mythtv/libs/libmythbluray/bdnav/mpls_parse.c rename to mythtv/external/libmythbluray/bdnav/mpls_parse.c diff --git a/mythtv/libs/libmythbluray/bdnav/mpls_parse.h b/mythtv/external/libmythbluray/bdnav/mpls_parse.h similarity index 100% rename from mythtv/libs/libmythbluray/bdnav/mpls_parse.h rename to mythtv/external/libmythbluray/bdnav/mpls_parse.h diff --git a/mythtv/libs/libmythbluray/bdnav/navigation.c b/mythtv/external/libmythbluray/bdnav/navigation.c similarity index 100% rename from mythtv/libs/libmythbluray/bdnav/navigation.c rename to mythtv/external/libmythbluray/bdnav/navigation.c diff --git a/mythtv/libs/libmythbluray/bdnav/navigation.h b/mythtv/external/libmythbluray/bdnav/navigation.h similarity index 100% rename from mythtv/libs/libmythbluray/bdnav/navigation.h rename to mythtv/external/libmythbluray/bdnav/navigation.h diff --git a/mythtv/libs/libmythbluray/bdnav/sound_parse.c b/mythtv/external/libmythbluray/bdnav/sound_parse.c similarity index 100% rename from mythtv/libs/libmythbluray/bdnav/sound_parse.c rename to mythtv/external/libmythbluray/bdnav/sound_parse.c diff --git a/mythtv/libs/libmythbluray/bdnav/sound_parse.h b/mythtv/external/libmythbluray/bdnav/sound_parse.h similarity index 100% rename from mythtv/libs/libmythbluray/bdnav/sound_parse.h rename to mythtv/external/libmythbluray/bdnav/sound_parse.h diff --git a/mythtv/libs/libmythbluray/bdnav/uo_mask_table.h b/mythtv/external/libmythbluray/bdnav/uo_mask_table.h similarity index 100% rename from mythtv/libs/libmythbluray/bdnav/uo_mask_table.h rename to mythtv/external/libmythbluray/bdnav/uo_mask_table.h diff --git a/mythtv/libs/libmythbluray/bluray-version.h b/mythtv/external/libmythbluray/bluray-version.h similarity index 100% rename from mythtv/libs/libmythbluray/bluray-version.h rename to mythtv/external/libmythbluray/bluray-version.h diff --git a/mythtv/libs/libmythbluray/bluray.c b/mythtv/external/libmythbluray/bluray.c similarity index 100% rename from mythtv/libs/libmythbluray/bluray.c rename to mythtv/external/libmythbluray/bluray.c diff --git a/mythtv/libs/libmythbluray/bluray.h b/mythtv/external/libmythbluray/bluray.h similarity index 100% rename from mythtv/libs/libmythbluray/bluray.h rename to mythtv/external/libmythbluray/bluray.h diff --git a/mythtv/libs/libmythbluray/decoders/graphics_controller.c b/mythtv/external/libmythbluray/decoders/graphics_controller.c similarity index 100% rename from mythtv/libs/libmythbluray/decoders/graphics_controller.c rename to mythtv/external/libmythbluray/decoders/graphics_controller.c diff --git a/mythtv/libs/libmythbluray/decoders/graphics_controller.h b/mythtv/external/libmythbluray/decoders/graphics_controller.h similarity index 100% rename from mythtv/libs/libmythbluray/decoders/graphics_controller.h rename to mythtv/external/libmythbluray/decoders/graphics_controller.h diff --git a/mythtv/libs/libmythbluray/decoders/graphics_processor.c b/mythtv/external/libmythbluray/decoders/graphics_processor.c similarity index 100% rename from mythtv/libs/libmythbluray/decoders/graphics_processor.c rename to mythtv/external/libmythbluray/decoders/graphics_processor.c diff --git a/mythtv/libs/libmythbluray/decoders/graphics_processor.h b/mythtv/external/libmythbluray/decoders/graphics_processor.h similarity index 100% rename from mythtv/libs/libmythbluray/decoders/graphics_processor.h rename to mythtv/external/libmythbluray/decoders/graphics_processor.h diff --git a/mythtv/libs/libmythbluray/decoders/ig.h b/mythtv/external/libmythbluray/decoders/ig.h similarity index 100% rename from mythtv/libs/libmythbluray/decoders/ig.h rename to mythtv/external/libmythbluray/decoders/ig.h diff --git a/mythtv/libs/libmythbluray/decoders/ig_decode.c b/mythtv/external/libmythbluray/decoders/ig_decode.c similarity index 100% rename from mythtv/libs/libmythbluray/decoders/ig_decode.c rename to mythtv/external/libmythbluray/decoders/ig_decode.c diff --git a/mythtv/libs/libmythbluray/decoders/ig_decode.h b/mythtv/external/libmythbluray/decoders/ig_decode.h similarity index 100% rename from mythtv/libs/libmythbluray/decoders/ig_decode.h rename to mythtv/external/libmythbluray/decoders/ig_decode.h diff --git a/mythtv/libs/libmythbluray/decoders/m2ts_demux.c b/mythtv/external/libmythbluray/decoders/m2ts_demux.c similarity index 100% rename from mythtv/libs/libmythbluray/decoders/m2ts_demux.c rename to mythtv/external/libmythbluray/decoders/m2ts_demux.c diff --git a/mythtv/libs/libmythbluray/decoders/m2ts_demux.h b/mythtv/external/libmythbluray/decoders/m2ts_demux.h similarity index 100% rename from mythtv/libs/libmythbluray/decoders/m2ts_demux.h rename to mythtv/external/libmythbluray/decoders/m2ts_demux.h diff --git a/mythtv/libs/libmythbluray/decoders/overlay.h b/mythtv/external/libmythbluray/decoders/overlay.h similarity index 100% rename from mythtv/libs/libmythbluray/decoders/overlay.h rename to mythtv/external/libmythbluray/decoders/overlay.h diff --git a/mythtv/libs/libmythbluray/decoders/pes_buffer.c b/mythtv/external/libmythbluray/decoders/pes_buffer.c similarity index 100% rename from mythtv/libs/libmythbluray/decoders/pes_buffer.c rename to mythtv/external/libmythbluray/decoders/pes_buffer.c diff --git a/mythtv/libs/libmythbluray/decoders/pes_buffer.h b/mythtv/external/libmythbluray/decoders/pes_buffer.h similarity index 100% rename from mythtv/libs/libmythbluray/decoders/pes_buffer.h rename to mythtv/external/libmythbluray/decoders/pes_buffer.h diff --git a/mythtv/libs/libmythbluray/decoders/pg.h b/mythtv/external/libmythbluray/decoders/pg.h similarity index 100% rename from mythtv/libs/libmythbluray/decoders/pg.h rename to mythtv/external/libmythbluray/decoders/pg.h diff --git a/mythtv/libs/libmythbluray/decoders/pg_decode.c b/mythtv/external/libmythbluray/decoders/pg_decode.c similarity index 100% rename from mythtv/libs/libmythbluray/decoders/pg_decode.c rename to mythtv/external/libmythbluray/decoders/pg_decode.c diff --git a/mythtv/libs/libmythbluray/decoders/pg_decode.h b/mythtv/external/libmythbluray/decoders/pg_decode.h similarity index 100% rename from mythtv/libs/libmythbluray/decoders/pg_decode.h rename to mythtv/external/libmythbluray/decoders/pg_decode.h diff --git a/mythtv/libs/libmythbluray/file/dir_mythiowrapper.c b/mythtv/external/libmythbluray/file/dir_mythiowrapper.c similarity index 100% rename from mythtv/libs/libmythbluray/file/dir_mythiowrapper.c rename to mythtv/external/libmythbluray/file/dir_mythiowrapper.c diff --git a/mythtv/libs/libmythbluray/file/dir_posix.c b/mythtv/external/libmythbluray/file/dir_posix.c similarity index 100% rename from mythtv/libs/libmythbluray/file/dir_posix.c rename to mythtv/external/libmythbluray/file/dir_posix.c diff --git a/mythtv/libs/libmythbluray/file/dl.h b/mythtv/external/libmythbluray/file/dl.h similarity index 100% rename from mythtv/libs/libmythbluray/file/dl.h rename to mythtv/external/libmythbluray/file/dl.h diff --git a/mythtv/libs/libmythbluray/file/dl_posix.c b/mythtv/external/libmythbluray/file/dl_posix.c similarity index 100% rename from mythtv/libs/libmythbluray/file/dl_posix.c rename to mythtv/external/libmythbluray/file/dl_posix.c diff --git a/mythtv/libs/libmythbluray/file/file.h b/mythtv/external/libmythbluray/file/file.h similarity index 100% rename from mythtv/libs/libmythbluray/file/file.h rename to mythtv/external/libmythbluray/file/file.h diff --git a/mythtv/libs/libmythbluray/file/file_mythiowrapper.c b/mythtv/external/libmythbluray/file/file_mythiowrapper.c similarity index 100% rename from mythtv/libs/libmythbluray/file/file_mythiowrapper.c rename to mythtv/external/libmythbluray/file/file_mythiowrapper.c diff --git a/mythtv/libs/libmythbluray/file/file_mythiowrapper.h b/mythtv/external/libmythbluray/file/file_mythiowrapper.h similarity index 100% rename from mythtv/libs/libmythbluray/file/file_mythiowrapper.h rename to mythtv/external/libmythbluray/file/file_mythiowrapper.h diff --git a/mythtv/libs/libmythbluray/file/file_posix.c b/mythtv/external/libmythbluray/file/file_posix.c similarity index 100% rename from mythtv/libs/libmythbluray/file/file_posix.c rename to mythtv/external/libmythbluray/file/file_posix.c diff --git a/mythtv/libs/libmythbluray/file/filesystem.c b/mythtv/external/libmythbluray/file/filesystem.c similarity index 100% rename from mythtv/libs/libmythbluray/file/filesystem.c rename to mythtv/external/libmythbluray/file/filesystem.c diff --git a/mythtv/libs/libmythbluray/file/filesystem.h b/mythtv/external/libmythbluray/file/filesystem.h similarity index 100% rename from mythtv/libs/libmythbluray/file/filesystem.h rename to mythtv/external/libmythbluray/file/filesystem.h diff --git a/mythtv/libs/libmythbluray/hdmv/hdmv_insn.h b/mythtv/external/libmythbluray/hdmv/hdmv_insn.h similarity index 100% rename from mythtv/libs/libmythbluray/hdmv/hdmv_insn.h rename to mythtv/external/libmythbluray/hdmv/hdmv_insn.h diff --git a/mythtv/libs/libmythbluray/hdmv/hdmv_vm.c b/mythtv/external/libmythbluray/hdmv/hdmv_vm.c similarity index 100% rename from mythtv/libs/libmythbluray/hdmv/hdmv_vm.c rename to mythtv/external/libmythbluray/hdmv/hdmv_vm.c diff --git a/mythtv/libs/libmythbluray/hdmv/hdmv_vm.h b/mythtv/external/libmythbluray/hdmv/hdmv_vm.h similarity index 100% rename from mythtv/libs/libmythbluray/hdmv/hdmv_vm.h rename to mythtv/external/libmythbluray/hdmv/hdmv_vm.h diff --git a/mythtv/libs/libmythbluray/hdmv/mobj_parse.c b/mythtv/external/libmythbluray/hdmv/mobj_parse.c similarity index 100% rename from mythtv/libs/libmythbluray/hdmv/mobj_parse.c rename to mythtv/external/libmythbluray/hdmv/mobj_parse.c diff --git a/mythtv/libs/libmythbluray/hdmv/mobj_parse.h b/mythtv/external/libmythbluray/hdmv/mobj_parse.h similarity index 100% rename from mythtv/libs/libmythbluray/hdmv/mobj_parse.h rename to mythtv/external/libmythbluray/hdmv/mobj_parse.h diff --git a/mythtv/libs/libmythbluray/hdmv/mobj_print.c b/mythtv/external/libmythbluray/hdmv/mobj_print.c similarity index 100% rename from mythtv/libs/libmythbluray/hdmv/mobj_print.c rename to mythtv/external/libmythbluray/hdmv/mobj_print.c diff --git a/mythtv/libs/libmythbluray/keys.h b/mythtv/external/libmythbluray/keys.h similarity index 100% rename from mythtv/libs/libmythbluray/keys.h rename to mythtv/external/libmythbluray/keys.h diff --git a/mythtv/libs/libmythbluray/libmythbluray.pro b/mythtv/external/libmythbluray/libmythbluray.pro similarity index 61% rename from mythtv/libs/libmythbluray/libmythbluray.pro rename to mythtv/external/libmythbluray/libmythbluray.pro index ad9fb73ea87..fdb5806782d 100644 --- a/mythtv/libs/libmythbluray/libmythbluray.pro +++ b/mythtv/external/libmythbluray/libmythbluray.pro @@ -8,8 +8,8 @@ target.path = $${LIBDIR} INCLUDEPATH += . ../../ INCLUDEPATH += ./bdnav -INCLUDEPATH += ../libmythbase -INCLUDEPATH += ../libmythtv +INCLUDEPATH += ../../libs/libmythbase +INCLUDEPATH += ../../libs/libmythtv DEFINES += HAVE_CONFIG_H DLOPEN_CRYPTO_LIBS HAVE_PTHREAD_H HAVE_DIRENT_H HAVE_STRINGS_H @@ -44,4 +44,21 @@ INSTALLS += installjar QMAKE_CLEAN += libmythbluray.jar } -include ( ../libs-targetfix.pro ) +mingw { + dll : contains( TEMPLATE, lib ) { + + # Qt under Linux/UnixMac OS X builds libBlah.a and libBlah.so, + # but is using the Windows defaults libBlah.a and Blah.dll. + # + # So that our dependency targets work between SUBDIRS, override: + # + TARGET = lib$${TARGET} + + + # Windows doesn't have a nice variable like LD_LIBRARY_PATH, + # which means make install would be broken without extra steps. + # As a workaround, we store dlls with exes. Also improves debugging! + # + target.path = $${PREFIX}/bin + } +} diff --git a/mythtv/libs/libmythbluray/register.c b/mythtv/external/libmythbluray/register.c similarity index 100% rename from mythtv/libs/libmythbluray/register.c rename to mythtv/external/libmythbluray/register.c diff --git a/mythtv/libs/libmythbluray/register.h b/mythtv/external/libmythbluray/register.h similarity index 100% rename from mythtv/libs/libmythbluray/register.h rename to mythtv/external/libmythbluray/register.h diff --git a/mythtv/libs/libmythbluray/util/attributes.h b/mythtv/external/libmythbluray/util/attributes.h similarity index 100% rename from mythtv/libs/libmythbluray/util/attributes.h rename to mythtv/external/libmythbluray/util/attributes.h diff --git a/mythtv/libs/libmythbluray/util/bits.c b/mythtv/external/libmythbluray/util/bits.c similarity index 100% rename from mythtv/libs/libmythbluray/util/bits.c rename to mythtv/external/libmythbluray/util/bits.c diff --git a/mythtv/libs/libmythbluray/util/bits.h b/mythtv/external/libmythbluray/util/bits.h similarity index 100% rename from mythtv/libs/libmythbluray/util/bits.h rename to mythtv/external/libmythbluray/util/bits.h diff --git a/mythtv/libs/libmythbluray/util/log_control.h b/mythtv/external/libmythbluray/util/log_control.h similarity index 100% rename from mythtv/libs/libmythbluray/util/log_control.h rename to mythtv/external/libmythbluray/util/log_control.h diff --git a/mythtv/libs/libmythbluray/util/logging.c b/mythtv/external/libmythbluray/util/logging.c similarity index 100% rename from mythtv/libs/libmythbluray/util/logging.c rename to mythtv/external/libmythbluray/util/logging.c diff --git a/mythtv/libs/libmythbluray/util/logging.h b/mythtv/external/libmythbluray/util/logging.h similarity index 100% rename from mythtv/libs/libmythbluray/util/logging.h rename to mythtv/external/libmythbluray/util/logging.h diff --git a/mythtv/libs/libmythbluray/util/macro.h b/mythtv/external/libmythbluray/util/macro.h similarity index 100% rename from mythtv/libs/libmythbluray/util/macro.h rename to mythtv/external/libmythbluray/util/macro.h diff --git a/mythtv/libs/libmythbluray/util/mutex.h b/mythtv/external/libmythbluray/util/mutex.h similarity index 100% rename from mythtv/libs/libmythbluray/util/mutex.h rename to mythtv/external/libmythbluray/util/mutex.h diff --git a/mythtv/libs/libmythbluray/util/strutl.c b/mythtv/external/libmythbluray/util/strutl.c similarity index 100% rename from mythtv/libs/libmythbluray/util/strutl.c rename to mythtv/external/libmythbluray/util/strutl.c diff --git a/mythtv/libs/libmythbluray/util/strutl.h b/mythtv/external/libmythbluray/util/strutl.h similarity index 100% rename from mythtv/libs/libmythbluray/util/strutl.h rename to mythtv/external/libmythbluray/util/strutl.h diff --git a/mythtv/libs/libmythmetadata/libmythmetadata.pro b/mythtv/libs/libmythmetadata/libmythmetadata.pro index 697a944f58e..36272c99be5 100644 --- a/mythtv/libs/libmythmetadata/libmythmetadata.pro +++ b/mythtv/libs/libmythmetadata/libmythmetadata.pro @@ -27,12 +27,12 @@ SOURCES += mythuiimageresults.cpp INCLUDEPATH += ../libmythbase ../libmythtv INCLUDEPATH += ../.. ../ ./ ../libmythupnp ../libmythui -INCLUDEPATH += ../../external/FFmpeg ../libmyth ../libmythbluray +INCLUDEPATH += ../../external/FFmpeg ../libmyth ../../external/libmythbluray DEPENDPATH += ../libmythsamplerate ../libmythsoundtouch DEPENDPATH += ../libmythfreesurround DEPENDPATH += ../ ../libmythui ../libmythbase DEPENDPATH += ../libmythupnp ../libmythtv ../libmyth -DEPENDPATH += ../libmythbluray +DEPENDPATH += ../../external/libmythbluray LIBS += -L../libmythsamplerate -lmythsamplerate-$${LIBVERSION} LIBS += -L../libmythsoundtouch -lmythsoundtouch-$${LIBVERSION} @@ -46,7 +46,7 @@ LIBS += -L../../external/FFmpeg/libavutil -lmythavutil LIBS += -L../../external/FFmpeg/libavformat -lmythavformat LIBS += -L../libmyth -lmyth-$${LIBVERSION} LIBS += -L../libmythtv -lmythtv-$${LIBVERSION} -LIBS += -L../libmythbluray -lmythbluray-$${LIBVERSION} +LIBS += -L../../external/libmythbluray -lmythbluray-$${LIBVERSION} LIBS += -L../../external/FFmpeg/libswscale -lmythswscale using_mheg:LIBS += -L../libmythfreemheg -lmythfreemheg-$${LIBVERSION} using_live:LIBS += -L../libmythlivemedia -lmythlivemedia-$${LIBVERSION} diff --git a/mythtv/libs/libmythtv/Bluray/bdringbuffer.h b/mythtv/libs/libmythtv/Bluray/bdringbuffer.h index 929e9fdeab5..b6a7dd06e78 100644 --- a/mythtv/libs/libmythtv/Bluray/bdringbuffer.h +++ b/mythtv/libs/libmythtv/Bluray/bdringbuffer.h @@ -7,8 +7,9 @@ #include #include -#include "libmythbluray/bluray.h" -#include "libmythbluray/keys.h" +// external/libmythbluray +#include "bluray.h" +#include "keys.h" // Likely to cause collisions? #include "ringbuffer.h" #include "mythdate.h" diff --git a/mythtv/libs/libmythtv/libmythtv.pro b/mythtv/libs/libmythtv/libmythtv.pro index dbb85328232..38423f18c4b 100644 --- a/mythtv/libs/libmythtv/libmythtv.pro +++ b/mythtv/libs/libmythtv/libmythtv.pro @@ -23,7 +23,6 @@ DEPENDPATH += . DEPENDPATH += ../libmyth ../libmyth/audio DEPENDPATH += ../libmythbase DEPENDPATH += ../libmythdvdnav/ -DEPENDPATH += ../libmythbluray/ DEPENDPATH += ./mpeg ./channelscan ./visualisations DEPENDPATH += ./recorders DEPENDPATH += ./recorders/dvbdev @@ -261,9 +260,9 @@ LIBS += -L../libmythdvdnav LIBS += -lmythdvdnav-$$LIBVERSION #Bluray stuff -DEPENDPATH += ../libmythbluray/ -INCLUDEPATH += ../libmythbluray/ -POST_TARGETDEPS += ../libmythbluray/libmythbluray-$${MYTH_LIB_EXT} +DEPENDPATH += ../../external/libmythbluray/ +INCLUDEPATH += ../../external/libmythbluray/ +POST_TARGETDEPS += ../../external/libmythbluray/libmythbluray-$${MYTH_LIB_EXT} HEADERS += Bluray/bdringbuffer.h SOURCES += Bluray/bdringbuffer.cpp using_frontend { @@ -274,7 +273,7 @@ using_frontend { HEADERS += Bluray/bdoverlayscreen.h SOURCES += Bluray/bdoverlayscreen.cpp } -LIBS += -L../libmythbluray +LIBS += -L../../external/libmythbluray LIBS += -lmythbluray-$$LIBVERSION #HLS stuff diff --git a/mythtv/libs/libs.pro b/mythtv/libs/libs.pro index 7ed1d3d929c..183d0a4ca5c 100644 --- a/mythtv/libs/libs.pro +++ b/mythtv/libs/libs.pro @@ -5,7 +5,7 @@ TEMPLATE = subdirs # Libraries without dependencies SUBDIRS += libmythsamplerate SUBDIRS += libmythsoundtouch libmythdvdnav -SUBDIRS += libmythbluray libmythfreesurround libmythbase +SUBDIRS += libmythfreesurround libmythbase SUBDIRS += libmythservicecontracts using_mheg:SUBDIRS += libmythfreemheg diff --git a/mythtv/programs/programs-libs.pro b/mythtv/programs/programs-libs.pro index 8760066505f..1370e434b63 100644 --- a/mythtv/programs/programs-libs.pro +++ b/mythtv/programs/programs-libs.pro @@ -2,7 +2,7 @@ INCLUDEPATH += ../.. ../../libs/ ../../libs/libmyth ../../libs/libmyth/audio INCLUDEPATH += ../../libs/libmythtv ../../external/FFmpeg INCLUDEPATH += ../../libs/libmythupnp ../../libs/libmythui ../../libs/libmythmetadata INCLUDEPATH += ../../libs/libmythlivemedia ../../libs/libmythbase -INCLUDEPATH += ../../libs/libmythdvdnav ../../libs/libmythbluray ../../libs/libmythsamplerate +INCLUDEPATH += ../../libs/libmythdvdnav ../../external/libmythbluray ../../libs/libmythsamplerate INCLUDEPATH += ../../libs/libmythtv/mpeg INCLUDEPATH += ../../libs/libmythtv/vbitext INCLUDEPATH += ../../libs/libmythservicecontracts