Permalink
Browse files

Before production version.

  • Loading branch information...
1 parent 762a307 commit 9825fafd6360392a6fac850e78536a6a74183142 @janmyler committed May 13, 2012
View
46 404.html
@@ -1,46 +0,0 @@
-<!--
- Default H5BP 404 page.
--->
-<!doctype html>
-<html lang="en">
-<head>
- <meta charset="utf-8">
- <title>Page Not Found :(</title>
- <style>
- ::-moz-selection { background: #fe57a1; color: #fff; text-shadow: none; }
- ::selection { background: #fe57a1; color: #fff; text-shadow: none; }
- html { padding: 30px 10px; font-size: 20px; line-height: 1.4; color: #737373; background: #f0f0f0; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; }
- html, input { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; }
- body { max-width: 500px; _width: 500px; padding: 30px 20px 50px; border: 1px solid #b3b3b3; border-radius: 4px; margin: 0 auto; box-shadow: 0 1px 10px #a7a7a7, inset 0 1px 0 #fff; background: #fcfcfc; }
- h1 { margin: 0 10px; font-size: 50px; text-align: center; }
- h1 span { color: #bbb; }
- h3 { margin: 1.5em 0 0.5em; }
- p { margin: 1em 0; }
- ul { padding: 0 0 0 40px; margin: 1em 0; }
- .container { max-width: 380px; _width: 380px; margin: 0 auto; }
- /* google search */
- #goog-fixurl ul { list-style: none; padding: 0; margin: 0; }
- #goog-fixurl form { margin: 0; }
- #goog-wm-qt, #goog-wm-sb { border: 1px solid #bbb; font-size: 16px; line-height: normal; vertical-align: top; color: #444; border-radius: 2px; }
- #goog-wm-qt { width: 220px; height: 20px; padding: 5px; margin: 5px 10px 0 0; box-shadow: inset 0 1px 1px #ccc; }
- #goog-wm-sb { display: inline-block; height: 32px; padding: 0 10px; margin: 5px 0 0; white-space: nowrap; cursor: pointer; background-color: #f5f5f5; background-image: -webkit-linear-gradient(rgba(255,255,255,0), #f1f1f1); background-image: -moz-linear-gradient(rgba(255,255,255,0), #f1f1f1); background-image: -ms-linear-gradient(rgba(255,255,255,0), #f1f1f1); background-image: -o-linear-gradient(rgba(255,255,255,0), #f1f1f1); -webkit-appearance: none; -moz-appearance: none; appearance: none; *overflow: visible; *display: inline; *zoom: 1; }
- #goog-wm-sb:hover, #goog-wm-sb:focus { border-color: #aaa; box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1); background-color: #f8f8f8; }
- #goog-wm-qt:focus, #goog-wm-sb:focus { border-color: #105cb6; outline: 0; color: #222; }
- input::-moz-focus-inner { padding: 0; border: 0; }
- </style>
-</head>
-<body>
- <div class="container">
- <h1>Not found <span>:(</span></h1>
- <p>Sorry, but the page you were trying to view does not exist.</p>
- <p>It looks like this was the result of either:</p>
- <ul>
- <li>a mistyped address</li>
- <li>an out-of-date link</li>
- </ul>
- <script>
- var GOOG_FIXURL_LANG = (navigator.language || '').slice(0,2),GOOG_FIXURL_SITE = location.host;
- </script>
- <script src="http://linkhelp.clients.google.com/tbproxy/lh/wm/fixurl.js"></script>
- </div>
-
View
8 TODO.txt
@@ -1,11 +1,5 @@
# List of TODOs
+ Jaka je maximalni velikost souboru, kterou muze nahrat FileReader, aby nespadlo nahraveni?
-+ Pomocne ikonove menu do #editor-view (napr. lupa, vyber, atd.) – kde ukladat vybrany nastroj?
+ Maximalni velikost pameti pro zalozku prohlizece, hlaseni velikosti zabrane pameti v ramci sandboxu?
+ Zmena nastaveni vzorkovaci frekvence Audio API? [nelze]
-+ Track analyser?
-
-+ Prehravani od kurzoru pri loopu klipu obcas nefunguje spravne.
-+ Predelani obrazku (favicon/apple icons).
-+ About a help sekce v menu – dopsat texty.
-+ Pri zmene hlasitosti u Tracku, zacne hrat (i kdyz je zvoleny jiny track jako solo)!
++ Track analyser?
View
BIN apple-touch-icon-114x114-precomposed.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN apple-touch-icon-57x57-precomposed.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN apple-touch-icon-72x72-precomposed.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN apple-touch-icon-precomposed.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN apple-touch-icon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN favicon.ico
Binary file not shown.
View
2 humans.txt
@@ -9,7 +9,7 @@
/* SITE */
Standards: HTML5, CSS3
- Components: jQuery, Backbone.js, Require.js, LESS, Web Audio API
+ Components: jQuery, Backbone.js, Require.js, LESS, Web Audio API, Twitter Bootstrap
Software: Sublime Text 2
.o. .o8 o8o
View
26 index.html
@@ -2,19 +2,26 @@
<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js lt-ie9" lang="en"> <![endif]-->
-<!-- Consider adding a manifest.appcache: h5bp.com/d/Offline -->
<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
<head>
<meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+<!--
+ .o. .o8 o8o
+ .888. "888 `"'
+ .8"888. oooo oooo .oooo888 oooo .ooooo. .ooooo.
+ .8' `888. `888 `888 d88' `888 `888 d88' `88b d88' `88b
+ .88ooo8888. 888 888 888 888 888 888ooo888 888ooo888
+ .8' `888. 888 888 888 888 888 888 .o 888 .o
+o88o o8888o `V88V"V8P' `Y8bod88P" o888o `Y8bod8P' `Y8bod8P'
+
+-->
<title>Audiee</title>
<meta name="description" content="Simple experimental web based audio editor.">
<meta name="author" content="Jan Myler">
<link rel="author" href="humans.txt">
-
- <!-- Mobile viewport optimized: h5bp.com/viewport -->
+ <link rel="shortcut icon" href="favicon.ico">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width">
-
<link rel="stylesheet/less" href="less/style.less">
<script src="js/libs/less-1.2.2.js"></script>
<!-- Use SimpLESS (Win/Linux/Mac) or LESS.app (Mac) to compile your .less files
@@ -55,13 +62,12 @@
<!-- JavaScript at the bottom for fast page loading -->
<script data-main="js/main" src="js/libs/require/require.js"></script>
- <!-- Grab Google CDN's jQuery, with a protocol relative URL; fall back to local if offline -->
-
- <!-- <script>
- var _gaq=[['_setAccount','UA-XXXXX-X'],['_trackPageview']];
+ <!-- Google Analytics -->
+ <script>
+ var _gaq=[['_setAccount','UA-31648389-1'],['_trackPageview']];
(function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];
g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
s.parentNode.insertBefore(g,s)}(document,'script'));
- </script> -->
+ </script>
</body>
</html>
View
10 js/Audiee/Collections.Tracks.js
@@ -41,6 +41,16 @@ define([
getIndexCount: function() {
return this.indexCount;
+ },
+
+ isAnySolo: function() {
+ var soloTracks = this.filter(
+ function(model) {
+ return model.get('solo') === true;
+ }
+ );
+
+ return soloTracks.length > 0;
}
});
});
View
10 js/Audiee/Helpers.Player.js
@@ -76,7 +76,7 @@ define([
cursor = Audiee.Views.Editor.getCursor();
if (trackPosition + clip.clipLength() <= cursor)
- return; // clip is before a cursor's position
+ return; // clip is before the cursor position
else if (trackPosition < cursor && trackPosition + clip.clipLength() > cursor) {
// virtually splits the clip
startTime = (startTime + cursor - trackPosition) % duration;
@@ -90,19 +90,19 @@ define([
node = that.context.createBufferSource();
that.nodes.push(node);
node.buffer = clip.get('buffer');
- node.connect(gainNode); // bude gainNode pro track
+ node.connect(gainNode); // connects node to track's gain node
// clip offset and duration times
if (loop > 0) {
- if (i === 0) {
+ if (i === 0) { // first subclip
offset = startTime;
duration = duration - offset;
- } else if (i === loop) {
+ } else if (i === loop) { // last subclip
offset = 0;
duration = endTime;
} else {
offset = 0;
- duration = duration;
+ duration = clip.get('buffer').duration;
}
} else { // loop === 0
offset = startTime;
View
1 js/Audiee/Views.Menu.js
@@ -220,6 +220,7 @@ define([
$tpl = $(tpl);
$tpl.on('hide', function() { $tpl.remove() })
+ .width(680).css('max-height', 530 + 'px')
.modal(); // show the modal window
}
});
View
12 js/Audiee/Views.TrackControls.js
@@ -53,10 +53,16 @@ define([
var volume = $('input.volume', this.el).val() / 100,
cid = $(this.el).parents('.track').data('cid');
+ // sets the new volume value into the model
this.model.set('gain', volume);
-
- Audiee.Player.volumeChange(volume, cid); // zmenit v souvislosti se solo
+ // change GainNode's volume only
+ // + if there are no solo tracks
+ // + or there are solo tracks and this track is one of them
+ if (!Audiee.Collections.Tracks.isAnySolo() || this.model.get('solo'))
+ Audiee.Player.volumeChange(volume, cid);
+
+ // disables the mute if it was activated
if ($('button.mute', this.el).hasClass('active')) {
$('button.mute', this.el).button('toggle');
this.mute();
@@ -69,7 +75,7 @@ define([
this.model.set('muted', !muted);
if (muted) {
// track was muted -- restores previous gain value
- if (!this.model.get('solo'))
+ if (!Audiee.Collections.Tracks.isAnySolo() || this.model.get('solo'))
Audiee.Player.volumeChange(this.model.get('gain'), this.model.cid);
} else {
// track is beeing muted (only if is not set as solo track)
View
21 js/templates/AboutAudiee.html
@@ -1,5 +1,20 @@
-** about me
+<p>This application has been created as bachelor's thesis at Brno University of Technology, Faculty of Information Technology.</p>
-** technology used
+<p>This version is more or less experimental and has only limited functionality.</p>
-** info links
+<h4>Tools making this app cool:</h4>
+<ul>
+ <li><a href="http://www.w3.org/TR/webaudio/">Web Audio API</a>
+ <li><a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap</a>
+ <li><a href="http://jquery.com/">jQuery</a>
+ <li><a href="http://backbonejs.org/">Backbone.js</a>
+ <li><a href="http://requirejs.org/">RequireJS</a>
+ <li><a href="http://lesscss.org/">LESS</a>
+</ul>
+<h4>Contact me:</h4>
+<ul>
+ <li>honza.myler@gmail.com
+ <li><a href="http://twitter.com/janmyler">@janmyler</a>
+</ul>
+
+<img class="audiee-logo" src="apple-touch-icon-114x114-precomposed.png" alt="Audiee logo">
View
3 js/templates/HelpAudiee.html
@@ -1 +1,2 @@
-<p>Help contents!</p>
+<p>For help please watch this short tutorial video.</p>
+<iframe width="640" height="360" src="http://www.youtube.com/embed/l67Jk9Vbms8?rel=0" frameborder="0" allowfullscreen></iframe>
View
8 less/style.less
@@ -407,7 +407,13 @@ body {
background: @gray;
}
-
+/* Audiee logo */
+.audiee-logo {
+ position: absolute;
+ bottom: 90px;
+ right: 30px;
+ border-radius: 100px;
+}

0 comments on commit 9825faf

Please sign in to comment.