fixed gitgnore

master
Angeliki 6 years ago
commit 30cfac5d98

7
.gitignore vendored

@ -1,7 +1,8 @@
project/podcasts/*
podcasts/*
thesis/*.pdf
thesis/drafts/*
project/audio/
project/images/
uploads/*
audio/*
images/*

@ -113,7 +113,7 @@ echo '</p></div></td>'; } ?>
<br />
<?php
$files = glob("uploads/*.wav");
$files = glob("uploads/*");
for ($i=0; $i<count($files); $i++)
{$num = $files[$i];
$var1 = $_GET["files"]["name"];
@ -214,8 +214,8 @@ echo '<audio src='.$num.' controls></audio><br /><br />'; }
recorderObject = $recorder.data('recorderObject');
recorderObject.stop();
recorderObject.exportWAV(function(base64_wav_data) {
var url = 'data:audio/wav;base64,' + base64_wav_data;
recorderObject.exportMP3(function(base64_data) {
var url = 'data:audio/mp3;base64,' + base64_data;
var au = document.createElement('audio');
document.getElementById("playerContainer").innerHTML = "";
@ -245,9 +245,9 @@ echo '<audio src='.$num.' controls></audio><br /><br />'; }
$.ajax({
type: "POST",
url: "scripts/uploadWav.php",
url: "scripts/uploadMp3.php",
data: {
wavBase64: dataURL
base64: dataURL
}
}).done(function(o) {
console.log('saved');

@ -0,0 +1,13 @@
<?php
error_reporting(-1);
ini_set("display_errors", "On");
// requires php5
define('UPLOAD_DIR', '../uploads/');
$img = $_POST['base64'];
$img = str_replace('data:audio/mp3;base64,', '', $img);
$img = str_replace(' ', '+', $img);
$data = base64_decode($img);
$file = UPLOAD_DIR . uniqid() . '.mp3';
$success = file_put_contents($file, $data);
print $success ? $file : 'Unable to save the file.';
?>

@ -1,4 +1,6 @@
<?php
error_reporting(-1);
ini_set("display_errors", "On");
// requires php5
define('UPLOAD_DIR', '../uploads/');
$img = $_POST['wavBase64'];
@ -8,5 +10,4 @@ $data = base64_decode($img);
$file = UPLOAD_DIR . uniqid() . '.wav';
$success = file_put_contents($file, $data);
print $success ? $file : 'Unable to save the file.';
?>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 347 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 265 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 826 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 209 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 129 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 225 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 570 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 124 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 412 KiB

@ -72,46 +72,46 @@
<div class="draggable" style="top: 2000px;left: 1247px;">
<div class="tooltip-wrap" style="text-decoration:underline;"><a target="_blank" href="katalin.jpg"><img src="katalin.jpg" width="500px"></a><div class="tooltip-content-right"><div>Figure 2: Vocal performance of Katalin Ladik
<div class="tooltip-wrap" style="text-decoration:underline;"><a target="_blank" href="../../images/katalin.jpg"><img src="../../images/katalin.jpg" width="500px"></a><div class="tooltip-content-right"><div>Figure 2: Vocal performance of Katalin Ladik
</div></div></div></div>
<div class="draggable" style="top: 2468px; left: -6px;">
<div class="tooltip-wrap" style="text-decoration:underline;"><a target="_blank" href="miss-triggs.jpg"><img src="miss-triggs.jpg" width="500px"></a><div class="tooltip-content-right"><div>Figure 3: Cartoon from Riana Dunkan
<div class="tooltip-wrap" style="text-decoration:underline;"><a target="_blank" href="../../images/miss-triggs.jpg"><img src="../../images/miss-triggs.jpg" width="500px"></a><div class="tooltip-content-right"><div>Figure 3: Cartoon from Riana Dunkan
</div></div></div></div>
<div class="draggable" style="top: 2980px; left: -33px;">
<div class="tooltip-wrap" style="text-decoration:underline;"> <a target="_blank" href="gonzalo.jpg"><img src="gonzalo.jpg" width="500px"></a><div class="tooltip-content-right"><div>Figure 4: Cartoon from Gonzalo Rocha
<div class="tooltip-wrap" style="text-decoration:underline;"> <a target="_blank" href="../../images/gonzalo.jpg"><img src="../../images/gonzalo.jpg" width="500px"></a><div class="tooltip-content-right"><div>Figure 4: Cartoon from Gonzalo Rocha
</div></div></div></div>
<div class="draggable" style="top: 3150px;left: 1482px;">
<div class="tooltip-wrap" style="text-decoration:underline;"><a target="_blank" href="laurie.jpg"><img src="laurie.jpg" width="500px"></a><div class="tooltip-content-right"><div>Figure 5: Performance from Laurie Anderson
<div class="tooltip-wrap" style="text-decoration:underline;"><a target="_blank" href="../../images/laurie.jpg"><img src="../../images/laurie.jpg" width="500px"></a><div class="tooltip-content-right"><div>Figure 5: Performance from Laurie Anderson
</div></div></div></div>
<div class="draggable" style="top: 4836px; left: 32px;">
<div class="tooltip-wrap" style="text-decoration:underline;"><a target="_blank" href="occupy-davis-butler.jpg"><img src="occupy-davis-butler.jpg" width="1000px"></a><div class="tooltip-content-right"><div>Figure 6: Speeches of Angela Davis and Judith Butler in Occupy Wall Street
<div class="tooltip-wrap" style="text-decoration:underline;"><a target="_blank" href="../../images/occupy-davis-butler.jpg"><img src="../../images/occupy-davis-butler.jpg" width="1000px"></a><div class="tooltip-content-right"><div>Figure 6: Speeches of Angela Davis and Judith Butler in Occupy Wall Street
</div></div></div></div>
<div class="draggable" style="top: 5463px; left: 1513px;">
<div class="tooltip-wrap" style="text-decoration:underline;"><a target="_blank" href="mikrofoniki.jpg"><img src="mikrofoniki.jpg" width="500px"></a><div class="tooltip-content-right"><div>Figure 7: 'Mikrophoniki' demonstration in Athens
<div class="tooltip-wrap" style="text-decoration:underline;"><a target="_blank" href="../../images/mikrofoniki.jpg"><img src="../../images/mikrofoniki.jpg" width="500px"></a><div class="tooltip-content-right"><div>Figure 7: 'Mikrophoniki' demonstration in Athens
</div></div></div></div>
<div class="draggable" style="top: 5721px; left: 40px;">
<div class="tooltip-wrap" style="text-decoration:underline;"><a target="_blank" href="feminists.JPG"><img src="feminists.JPG" width="500px"></a><div class="tooltip-content-right"><div>Figure 8: Speech Matters: Violence and the Feminist Voice
<div class="tooltip-wrap" style="text-decoration:underline;"><a target="_blank" href="../../images/feminists.JPG"><img src="../../images/feminists.JPG" width="500px"></a><div class="tooltip-content-right"><div>Figure 8: Speech Matters: Violence and the Feminist Voice
</div></div></div></div>
<div class="draggable" style="top: 6805px; left: 1407px;">
<div class="tooltip-wrap" style="text-decoration:underline;"><a target="_blank" href="broadcastcart.jpg"><img src="broadcastcart.jpg" width="500px"></a><div class="tooltip-content-right"><div>Figure 9: 'The Broadcast Cart' of Miranda Zúñiga transmitting
<div class="tooltip-wrap" style="text-decoration:underline;"><a target="_blank" href="../../images/broadcastcart.jpg"><img src="../../images/broadcastcart.jpg" width="500px"></a><div class="tooltip-content-right"><div>Figure 9: 'The Broadcast Cart' of Miranda Zúñiga transmitting
</div></div></div></div>
<div class="draggable" style="top: 8343px;left: -22px;">
<div class="tooltip-wrap" style="text-decoration:underline;"><a target="_blank" href="twomouths.jpg"><img src="twomouths.jpg" width="500px"></a><div class="tooltip-content-right"><div>Figure 10: A sculpture of Baubo, goddess of sacred and sexual humor
<div class="tooltip-wrap" style="text-decoration:underline;"><a target="_blank" href="../../images/twomouths.jpg"><img src="../../images/twomouths.jpg" width="500px"></a><div class="tooltip-content-right"><div>Figure 10: A sculpture of Baubo, goddess of sacred and sexual humor
</div></div></div></div>
<div class="draggable" style="top: 8565px; left: 1442px;">
<div class="tooltip-wrap" style="text-decoration:underline;"><a target="_blank" href="liveoccupy.jpg"><img src="liveoccupy.jpg" width="500px"></a><div class="tooltip-content-right"><div>Figure 11: Live streaming from Occupy Wall Street
<div class="tooltip-wrap" style="text-decoration:underline;"><a target="_blank" href="../../images/liveoccupy.jpg"><img src="../../images/liveoccupy.jpg" width="500px"></a><div class="tooltip-content-right"><div>Figure 11: Live streaming from Occupy Wall Street
</div></div></div></div>
<!-- end of draggable images -->

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

Loading…
Cancel
Save