diff --git a/conf/conf.php b/conf/conf.php index 96fd089..bd8f374 100644 --- a/conf/conf.php +++ b/conf/conf.php @@ -1,6 +1,9 @@ + + +Soundport + + + + +
+ + + +
+ +
+ Large toggle button +
+ + +
+
+
+
+ 00:00 / + 00:00 +
+
+ + +
+
+
+
+
+
+
+
+ +
+ + +
+ Previous track button + Next track button +
+ + +
+ + +
+ +
+
+ Small toggle button +
+
+ 1. +
+
+ Solaar 1 +
+
+ + +
+
+ Small toggle button +
+
+ 2. +
+
+ Solaar 2 +
+
+ + +
+
+ Small toggle button +
+
+ 3. +
+
+ Solaar 3 +
+
+ + + +
+
+ + + + + diff --git a/test.txt b/test.txt deleted file mode 100644 index 28d0af9..0000000 --- a/test.txt +++ /dev/null @@ -1 +0,0 @@ -coucou diff --git a/youtube.php b/youtube.php index 39313f0..946caf3 100644 --- a/youtube.php +++ b/youtube.php @@ -1,7 +1,11 @@ ls($dirHash); + + $videoHash = $obj[0]['Hash']; + + $youtubeID = quickfix_getYoutubeIdFromIpfsFileName($obj[0]['Name']); + $videoName = quickfix_getVideoNameFromIpfsFileName($obj[0]['Name']); + if ($mimeType == 'video/mp4') { $videosList[] = [ 'mime' => $mimeType, - 'url' => $videoURL, - 'uri' => $videoURI, + 'uri' => $dirURI, + 'hash' => $videoHash, + 'dirHash' => $dirHash, 'name' => $videoName, 'youtubeID' => $youtubeID ]; @@ -41,7 +54,7 @@ foreach ($videosList as $video) { echo '
  • '; - $href = 'youtube_watch.php?uri='. urlencode($video['uri']) . '&name='. urlencode($video['name']) .'&mime='. $video['mime']; + $href = 'youtube_watch.php?dirHash='. $video['dirHash'] . '&uri='. urlencode($video['uri']) . '&name='. urlencode($video['name']) .'&mime='. $video['mime']; echo ' diff --git a/youtube_watch.php b/youtube_watch.php index f3c3267..a08b85f 100644 --- a/youtube_watch.php +++ b/youtube_watch.php @@ -1,20 +1,19 @@ ls($_GET['dirHash']); +$videoName = quickfix_getVideoNameFromIpfsFileName($obj[0]['Name']); +$videoHash = $obj[0]['Hash']; +$videoURL = 'http://'. IPFS_HOST. ':' . IPFS_API_PORT . '/ipfs/' . htmlspecialchars($videoHash); + include('inc/header.php'); echo '