fix #331: remove submodule hls.js

3 weeks ago · 890cdbe5ae
parent 44ea524f72
commit 890cdbe5ae
5 changed files with 7 additions and 8 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,6 +1,4 @@
 [submodule "v4l2wrapper"]
 	path = libv4l2cpp
 	url = https://github.com/mpromonet/v4l2wrapper
-[submodule "hls.js"]
-	path = hls.js
-	url = https://github.com/video-dev/hls.js
+
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -160,7 +160,7 @@ endif (SYSTEMD_FOUND)
 # package
 install (TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
 install (FILES index.html DESTINATION share/${PROJECT_NAME}/)
-install (FILES hls.js/dist/hls.light.min.js DESTINATION share/${PROJECT_NAME}/hls.js/dist/)
+install (FILES hls.js DESTINATION share/${PROJECT_NAME}/)

 SET(CPACK_GENERATOR "DEB")
 IF(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
--- a/README.md
+++ b/README.md
@ -158,7 +158,7 @@ It is now possible to play HLS url directly from browser :
 * using Firefox installing [Native HLS addons](https://addons.mozilla.org/en-US/firefox/addon/native_hls_playback)
 * using Chrome installing [Native HLS playback](https://chrome.google.com/webstore/detail/native-hls-playback/emnphkkblegpebimobpbekeedfgemhof)

-There is also a small HTML page that use hls.js and dash.js, but dash still not work because player doesnot support MP2T format.
+There is also a small HTML page that use hls.js.

 Using Docker image
 ===============
--- a/hls.js
+++ b/hls.js
@ -1 +0,0 @@
-Subproject commit e90a1b999071e88af0f734ef18b9e8520c839cec
--- a/hls.js
+++ b/hls.js
--- a/index.html
+++ b/index.html
@ -6,10 +6,10 @@
    </style>
    <body>
 	<!--fill streamList variable with the list of streams -->
-	<script src="/getStreamList?streamList" ></script>
+	<script src="getStreamList?streamList" ></script>
 	<h3>HLS</h3>
 	<div id="videos"></div>
-	<script src="hls.js/dist/hls.light.min.js" ></script>
+	<script src="hls.js" ></script>
 	<script>
 		if (Hls.isSupported()) {
 			var videos = document.getElementById("videos")
				`@ -1 +0,0 @@`
				`Subproject commit e90a1b999071e88af0f734ef18b9e8520c839cec`