diff --git a/.gitignore b/.gitignore index 97a3407..d24d97d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,8 @@ -project/podcasts/* +podcasts/* thesis/*.pdf +uploads thesis/drafts/ -project/audio/ -project/images/ +audio/ +images/ diff --git a/podcast1.php b/podcast1.php index 5be25af..5b9b035 100644 --- a/podcast1.php +++ b/podcast1.php @@ -108,7 +108,7 @@ echo '

'; } ?>


'; } 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 = ""; @@ -240,9 +240,9 @@ echo '

'; } $.ajax({ type: "POST", - url: "scripts/uploadWav.php", + url: "scripts/uploadMp3.php", data: { - wavBase64: dataURL + base64: dataURL } }).done(function(o) { console.log('saved'); diff --git a/scripts/uploadMp3.php b/scripts/uploadMp3.php new file mode 100644 index 0000000..d36c7d4 --- /dev/null +++ b/scripts/uploadMp3.php @@ -0,0 +1,13 @@ + \ No newline at end of file diff --git a/scripts/uploadWav.php b/scripts/uploadWav.php index e5979a7..882fff5 100644 --- a/scripts/uploadWav.php +++ b/scripts/uploadWav.php @@ -1,4 +1,6 @@ \ No newline at end of file diff --git a/texts/thesis/broadcastcart.jpg b/texts/thesis/broadcastcart.jpg deleted file mode 100644 index 8015ef3..0000000 Binary files a/texts/thesis/broadcastcart.jpg and /dev/null differ diff --git a/texts/thesis/carson-list.jpg b/texts/thesis/carson-list.jpg deleted file mode 100644 index df90dbf..0000000 Binary files a/texts/thesis/carson-list.jpg and /dev/null differ diff --git a/texts/thesis/feminists.JPG b/texts/thesis/feminists.JPG deleted file mode 100644 index bc2c1a5..0000000 Binary files a/texts/thesis/feminists.JPG and /dev/null differ diff --git a/texts/thesis/gonzalo.jpg b/texts/thesis/gonzalo.jpg deleted file mode 100644 index efc3d18..0000000 Binary files a/texts/thesis/gonzalo.jpg and /dev/null differ diff --git a/texts/thesis/katalin.jpg b/texts/thesis/katalin.jpg deleted file mode 100644 index b0fb11e..0000000 Binary files a/texts/thesis/katalin.jpg and /dev/null differ diff --git a/texts/thesis/laurie.jpg b/texts/thesis/laurie.jpg deleted file mode 100644 index f877b42..0000000 Binary files a/texts/thesis/laurie.jpg and /dev/null differ diff --git a/texts/thesis/liveoccupy.jpg b/texts/thesis/liveoccupy.jpg deleted file mode 100644 index ef4cfc2..0000000 Binary files a/texts/thesis/liveoccupy.jpg and /dev/null differ diff --git a/texts/thesis/lucretia.jpg b/texts/thesis/lucretia.jpg deleted file mode 100644 index 583bc74..0000000 Binary files a/texts/thesis/lucretia.jpg and /dev/null differ diff --git a/texts/thesis/megaphon.jpg b/texts/thesis/megaphon.jpg deleted file mode 100644 index fae76f6..0000000 Binary files a/texts/thesis/megaphon.jpg and /dev/null differ diff --git a/texts/thesis/mikrofoniki.jpg b/texts/thesis/mikrofoniki.jpg deleted file mode 100644 index 0544310..0000000 Binary files a/texts/thesis/mikrofoniki.jpg and /dev/null differ diff --git a/texts/thesis/miss-triggs.jpg b/texts/thesis/miss-triggs.jpg deleted file mode 100644 index feeaab5..0000000 Binary files a/texts/thesis/miss-triggs.jpg and /dev/null differ diff --git a/texts/thesis/occupy-davis-butler.jpg b/texts/thesis/occupy-davis-butler.jpg deleted file mode 100644 index 23e31b2..0000000 Binary files a/texts/thesis/occupy-davis-butler.jpg and /dev/null differ diff --git a/texts/thesis/radiocar1.jpg b/texts/thesis/radiocar1.jpg deleted file mode 100644 index 32fe967..0000000 Binary files a/texts/thesis/radiocar1.jpg and /dev/null differ diff --git a/texts/thesis/radiocar2.JPG b/texts/thesis/radiocar2.JPG deleted file mode 100644 index 997c87e..0000000 Binary files a/texts/thesis/radiocar2.JPG and /dev/null differ diff --git a/texts/thesis/thesis-angeliki.html b/texts/thesis/thesis-angeliki.html index ae5f8b0..3bb3d75 100644 --- a/texts/thesis/thesis-angeliki.html +++ b/texts/thesis/thesis-angeliki.html @@ -72,46 +72,46 @@
-
Figure 2: Vocal performance of Katalin Ladik +
Figure 2: Vocal performance of Katalin Ladik
-
Figure 3: Cartoon from Riana Dunkan +
Figure 3: Cartoon from Riana Dunkan
-
Figure 4: Cartoon from Gonzalo Rocha +
Figure 4: Cartoon from Gonzalo Rocha
-
Figure 5: Performance from Laurie Anderson +
Figure 5: Performance from Laurie Anderson
-
Figure 6: Speeches of Angela Davis and Judith Butler in Occupy Wall Street +
Figure 6: Speeches of Angela Davis and Judith Butler in Occupy Wall Street
-
Figure 7: 'Mikrophoniki' demonstration in Athens +
Figure 7: 'Mikrophoniki' demonstration in Athens
-
Figure 8: Speech Matters: Violence and the Feminist Voice +
Figure 8: Speech Matters: Violence and the Feminist Voice
-
Figure 9: 'The Broadcast Cart' of Miranda Zúñiga transmitting +
Figure 9: 'The Broadcast Cart' of Miranda Zúñiga transmitting
-
Figure 10: A sculpture of Baubo, goddess of sacred and sexual humor +
Figure 10: A sculpture of Baubo, goddess of sacred and sexual humor
-
Figure 11: Live streaming from Occupy Wall Street +
Figure 11: Live streaming from Occupy Wall Street
diff --git a/texts/thesis/twomouths.jpg b/texts/thesis/twomouths.jpg deleted file mode 100644 index 64bde0a..0000000 Binary files a/texts/thesis/twomouths.jpg and /dev/null differ