Fixed deleting clips.

janmyler · May 1, 2012 · 04cafd0 · 04cafd0
1 parent e166461
commit 04cafd0
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 12 deletions.
diff --git a/TODO.txt b/TODO.txt
@@ -6,6 +6,5 @@
 + velikost pameti pro zalozku..., hlaseni velikosti zabrane pameti v ramci sandboxu -- nejspis nejde...
 + zmena nastaveni vzorkovaci frekvence hmmm ... taky nejspis nejde menit (zatim?)
 
-+ solo
 + track analyser?
-+ !! smazani klipu/vyjmuti, nektere to smaze az na nekolikaty pokus??
++ prehravani od kurzoru pri loopu klipu obcas udela ulet (hraje spatne)
diff --git a/css/style.css b/css/style.css
diff --git a/index.html b/index.html
@@ -8,7 +8,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <title>Audiee</title>
-    <meta name="description" content="">
+    <meta name="description" content="Simple experimental web based audio editor.">
     <meta name="author" content="Jan Myler">
 
     <!-- Mobile viewport optimized: h5bp.com/viewport -->

diff --git a/js/Audiee/Collections.Clips.js b/js/Audiee/Collections.Clips.js
@@ -57,6 +57,7 @@ define([
 
         deleteSelection: function(from, to, except) {
             var that = this,
+                deleteRequest = [],
                 trackPos, end, startTime, endTime, loop, duration, newLoop, newEndTime, newStartTime;
 
             this.each(function(model) {
@@ -93,8 +94,8 @@ define([
                             });
                             that.add(clip);   
                         } else if (trackPos >= from && end <= to) {
-                            // clip begins and ends within the selection (removes the clip)
-                            that.remove(model);
+                            // clip begins and ends within the selection (prepares the clip for a removal)
+                            deleteRequest.push(model);
                         } else if (trackPos < from && end <= to) {  
                             // clip begins before the selection and ends within the selection (edits the endTime)
                             newEndTime = (startTime + from - trackPos) % duration;          
@@ -112,6 +113,9 @@ define([
                     }
                 }
             });
+
+            // removes the selected clips
+            this.remove(deleteRequest);    
         },
 
         addDuplicate: function(clip) {

diff --git a/js/Audiee/Views.TrackControls.js b/js/Audiee/Views.TrackControls.js
@@ -20,9 +20,9 @@ define([
         className: 'track-controls',
 
         template: _.template(
-            '<button class="btn mute {{ muted }}" data-toggle="button">M</button>' +
-            '<button class="btn solo {{ solo }}" data-toggle="button">S</button>' +
-            '<input type="range" class="volume" value="{{ gain }}">'
+            '<button class="btn mute {{ muted }}" data-toggle="button" title="mute">M</button>' +
+            '<button class="btn solo {{ solo }}" data-toggle="button" title="solo">S</button>' +
+            '<input type="range" class="volume" value="{{ gain }}" title="volume">'
         ),
 
         initialize: function() {
@@ -54,7 +54,8 @@ define([
                 cid = $(this.el).parents('.track').data('cid');
 
             this.model.set('gain', volume);
-            Audiee.Player.volumeChange(volume, cid);
+
+            Audiee.Player.volumeChange(volume, cid);  // zmenit v souvislosti se solo
 
             if ($('button.mute', this.el).hasClass('active')) {
                 $('button.mute', this.el).button('toggle');

diff --git a/js/router.js b/js/router.js
diff --git a/js/templates/Menu.html b/js/templates/Menu.html
@@ -1,4 +1,4 @@
-<li class="dropdown">
+<!-- <li class="dropdown">
     <a href="#" class="dropdown-toggle" data-toggle="dropdown">File <b class="caret"></b></a>
     <ul class="dropdown-menu">
         <li><a href="#" id="m-new">New</a></li>
@@ -7,7 +7,7 @@
         <li><a href="#" id="m-save">Save</a></li>
         <li><a href="#" id="m-saveas">Save As...</a></li>
     </ul>
-</li>
+</li> -->
 <li class="dropdown">
     <a href="#" class="dropdown-toggle" data-toggle="dropdown">Edit <b class="caret"></b></a>
     <ul class="dropdown-menu">

diff --git a/less/style.less b/less/style.less
@@ -168,6 +168,11 @@ body {
         width: 100px;
         margin: 5px;
       }
+
+      .btn {
+        margin: 10px 0 6px 10px;
+        padding: 6px 16px;
+      }
     }  
 
     .track-display {