replaces libwebsockets with mongoose, changed licese to gpl

add search support
add playlist support
various fixups
C Cleanup

Author: notandy

CMakeLists.txt

@@ -11,19 +11,27 @@ option(WITH_MPD_HOST_CHANGE "Let users of the web frontend change the MPD Host"
 find_package(LibMPDClient REQUIRED)
 find_package(Threads REQUIRED)
 
-configure_file(${PROJECT_SOURCE_DIR}/src/config.h.in
-    ${PROJECT_BINARY_DIR}/config.h)
+configure_file(src/config.h.in ${PROJECT_BINARY_DIR}/config.h)
 include_directories(${PROJECT_BINARY_DIR})
 
 include(CheckCSourceCompiles)
-include(CPack)
 
 set(CMAKE_C_FLAGS "-std=gnu99 -Wall") 
 set(CMAKE_C_FLAGS_DEBUG "-ggdb -pedantic")
 
+file(GLOB RESOURCES 
+	RELATIVE ${PROJECT_SOURCE_DIR}
+	htdocs/js/*
+	htdocs/assets/*
+	htdocs/css/*.min.css
+	htdocs/fonts/*
+	htdocs/index.html
+)
+
 add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/http_files.h
-    COMMAND perl mkdata.pl index.html js/* assets/* css/* fonts/* > ${PROJECT_BINARY_DIR}/http_files.h
-    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/htdocs
+    COMMAND perl htdocs/mkdata.pl ${RESOURCES} > ${PROJECT_BINARY_DIR}/http_files.h
+    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+    DEPENDS ${RESOURCES}
 )
 
 set(SOURCES

LICENSE

@@ -28,6 +28,10 @@ body {
 	min-width: 50px;
 }
 
+#search {
+  margin-right: -10px;
+}
+
 .btn-group-hover {
     opacity: 20%;
 }

htdocs/css/mpd.css

@@ -10,10 +10,11 @@
   <title>ympd</title>
 
   <!-- Bootstrap core CSS -->
-  <link href="css/bootstrap.css" rel="stylesheet">
+  <link href="css/bootstrap.min.css" rel="stylesheet">
+  <link href="css/bootstrap-theme.min.css" rel="stylesheet">
 
   <!-- Custom styles for this template -->
-  <link href="css/mpd.css" rel="stylesheet">
+  <link href="css/mpd.min.css" rel="stylesheet">
   <link href="assets/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon">
 
   <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
@@ -37,9 +38,8 @@
       <div class="collapse navbar-collapse">
 
         <ul id="nav_links" class="nav navbar-nav">
-          <li id="playlist"><a href="#/">Playlist</a></li>
+          <li id="queue"><a href="#/">Queue</a></li>
           <li id="browse"><a href="#/browse/">Browse database</a></li>
-          <li><a href="#" data-toggle="modal" data-target="#about">About</a></li>
           <li><a href="#" data-toggle="modal" data-target="#settings" onclick="getHost();">Settings</a></li>
         </ul>
 
@@ -65,6 +65,11 @@
             </div>
           </div>
         </div>
+        <form id="search" class="navbar-form navbar-right" role="search">
+          <div class="form-group">
+            <input type="text" class="form-control" placeholder="Search">
+          </div>
+        </form>
       </div><!--/.nav-collapse -->
     </div>
   </div>
@@ -77,7 +82,7 @@
 
         <div class="panel panel-primary">
           <!-- Default panel contents -->
-          <div id="panel-heading" class="panel-heading">Playlist</div>
+          <div id="panel-heading" class="panel-heading">Queue</div>
           <div class="panel-body">
             <h1>
               <span id="track-icon" class="glyphicon glyphicon-play"></span>
@@ -150,42 +155,21 @@ <h4>
   </div><!-- /.container -->
 
   <!-- Modal -->
-  <div class="modal fade" id="about" tabindex="-1" role="dialog" aria-labelledby="aboutLabel" aria-hidden="true">
+  <div class="modal fade" id="settings" tabindex="-1" role="dialog" aria-labelledby="settingsLabel" aria-hidden="true">
     <div class="modal-dialog">
       <div class="modal-content">
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-          <h2 class="modal-title" id="aboutLabel">About</h2>
+          <h2 class="modal-title" id="settingsLabel"><span class="glyphicon glyphicon-wrench"></span> Settings</h2>
         </div>
         <div class="modal-body">
           <h4><a href="http://www.ympd.org"><span class="glyphicon glyphicon-play-circle"></span> ympd</a>&nbsp;&nbsp;&nbsp;<small>MPD Web GUI - written in C, utilizing Websockets and Bootstrap/JS</small></h4>
           <p>
           ympd is a lightweight MPD (Music Player Daemon) web client that runs without a dedicated werbserver or interpreters like PHP, NodeJS or Ruby. It's tuned for minimal resource usage and requires only very litte dependencies.</p>
-          <p class="text-muted">
-          ympd <span id="ympd_version"></span><br/>
-          libmpdclient <span id="mpd_version"></span><br/>
-          </p>
           <h5>ympd uses following excellent software:</h5>
-          <h6><a href="http://libwebsockets.org">libWebSockets</a> <small>LGPL2.1 + static link exception</small></h6>
+          <h6><a href="http://cesanta.com/docs.html">Mongoose</a> <small>GPLv2</small></h6>
           <h6><a href="http://www.musicpd.org/libs/libmpdclient/">libMPDClient</a> <small>BSD License</small></h6>
-          <br/>
-        </div>
-        <div class="modal-footer">
-          <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-        </div>
-      </div><!-- /.modal-content -->
-    </div><!-- /.modal-dialog -->
-  </div><!-- /.modal -->
-
-  <!-- Modal -->
-  <div class="modal fade" id="settings" tabindex="-1" role="dialog" aria-labelledby="settingsLabel" aria-hidden="true">
-    <div class="modal-dialog">
-      <div class="modal-content">
-        <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-          <h2 class="modal-title" id="settingsLabel"><span class="glyphicon glyphicon-wrench"></span> Settings</h2>
-        </div>
-        <div class="modal-body">
+          <hr />
           <form role="form">
             <div class="row">
               <div class="form-group col-md-9">