Before production version.

janmyler · May 13, 2012 · 9825faf · 9825faf
1 parent 762a307
commit 9825faf
Show file tree

Hide file tree

Showing 17 changed files with 70 additions and 77 deletions.
diff --git a/404.html b/404.html
diff --git a/TODO.txt b/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?
diff --git a/apple-touch-icon-114x114-precomposed.png b/apple-touch-icon-114x114-precomposed.png
diff --git a/apple-touch-icon-57x57-precomposed.png b/apple-touch-icon-57x57-precomposed.png
diff --git a/apple-touch-icon-72x72-precomposed.png b/apple-touch-icon-72x72-precomposed.png
diff --git a/apple-touch-icon-precomposed.png b/apple-touch-icon-precomposed.png
diff --git a/apple-touch-icon.png b/apple-touch-icon.png
diff --git a/favicon.ico b/favicon.ico
diff --git a/humans.txt b/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                      

diff --git a/index.html b/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>
diff --git a/js/Audiee/Collections.Tracks.js b/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;
         }
 	});
 });
diff --git a/js/Audiee/Helpers.Player.js b/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;

diff --git a/js/Audiee/Views.Menu.js b/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
         }
     });

diff --git a/js/Audiee/Views.TrackControls.js b/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)

diff --git a/js/templates/AboutAudiee.html b/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">
diff --git a/js/templates/HelpAudiee.html b/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>
diff --git a/less/style.less b/less/style.less
@@ -407,7 +407,13 @@ body {
   background: @gray;
 }
 
-
+/* Audiee logo */
+.audiee-logo {
+  position: absolute;
+  bottom: 90px;
+  right: 30px;
+  border-radius: 100px;
+}