a few functioning

Gemfile.lock

@@ -95,6 +95,7 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
+    sqlite3 (1.3.9)
     thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)
@@ -121,5 +122,6 @@ DEPENDENCIES
   sass-rails (~> 4.0.3)
   sdoc (~> 0.4.0)
   spring
+  sqlite3
   turbolinks
   uglifier (>= 1.3.0)

app/assets/javascripts/forms.js

@@ -12,6 +12,14 @@ $(document).ready(function() {
     $( ".add_subtitles" ).toggle();
   });
 
+  $( "#show_add_audio_track" ).click(function() {
+    $( ".add_audio_track" ).toggle();
+  });
+
+  $( "#show_remove_audio_track" ).click(function() {
+    $( ".remove_audio_track" ).toggle();
+  });
+
   $('#generate').click(function(){
     $('#command_line').val("ffmpeg" + 
       " -i " + $('#input_name').val() + 
@@ -29,10 +37,18 @@ $(document).ready(function() {
   });
 
   $('#add_subtitles_generate').click(function(){
-    $('#command_line').val("ffmpeg" + 
+    $('#subtitles_command_line').val("ffmpeg" + 
-      " -i " + $('#input_name').val() + 
+      " -i " + $('#subtitles_input_name').val() + " -vf subtitles=" + $('#subtitles_name').val() + " " + $('#subtitles_output_name').val())
-      " " + $('#output_name').val())
   });
 
+  $('#add_audio_track_generate').click(function(){
+    $('#add_audio_track_command_line').val("ffmpeg" + 
+      " -i " + $('#audio_input_name').val() + " -i " + $('#audio_track_name').val() + " " + $('#audio_output_name').val())
+  });
+
+  $('#remove_audio_track_generate').click(function(){
+    $('#remove_audio_track_command_line').val("ffmpeg" + 
+      " -i " + $('#r_audio_input_name').val() + " " + $('#r_audio_track_name').val() + " -vcodec copy -an " + $('#r_audio_output_name').val())
+  });
 
 });

app/views/forms/_add_audio_track.html.erb

@@ -0,0 +1,51 @@
+    <div id="file_names">
+      <div class="well">
+      <fieldset>
+        <legend>Input</legend>
+          <div class="form-group">
+          <label class="control-label" for="audio_input_name">Input</label>
+            <div class="controls">
+            <input type="text" name="audio_input_name" id="audio_input_name" placeholder="input" />
+            </div>
+          </div>
+        <br/>
+      </fieldset>
+      </div>
+    </div>
+
+    <div class="well">
+    <fieldset>
+      <legend>Audio track</legend>
+        <div class="form-group">
+        <label class="control-label" for="audio_track_name">Audio track</label>
+          <div class="controls">
+          <input type="text" name="audio_track_name" id="audio_track_name" placeholder="subtitles" />
+          </div>
+        </div>
+    </fieldset>
+    </div>
+
+    <div class="well">
+    <fieldset>
+      <legend>Output</legend>
+        <div class="form-group">
+        <label class="control-label" for="audio_output_name">Output</label>
+          <div class="controls">
+          <input type="text" name="audio_output_name" id="audio_output_name" placeholder="output" />
+          </div>
+        </div>
+          </fieldset>
+          <br/>
+          <fieldset>
+      <input type="button" class="btn btn-large btn-primary" name="add_subtitles_generate" id="add_audio_track_generate" value="Generate" />
+          </fieldset>
+    </div>
+
+    <div class="well">
+      <fieldset>
+        <legend>Your command line:</legend>
+        <textarea name="add_audio_track_command_line" id="add_audio_track_command_line" rows="3" cols="100"></textarea>
+      </fieldset>
+    </div>
+
+  </div> <!-- container -->

app/views/forms/_add_subtitles.html.erb

@@ -3,9 +3,9 @@
       <fieldset>
         <legend>Input</legend>
           <div class="form-group">
-            <label class="control-label" for="input_name">Input</label>
+          <label class="control-label" for="subtitles_input_name">Input</label>
             <div class="controls">
-              <input type="text" name="input_name" id="input_name" placeholder="input" />
+            <input type="text" name="subtitles_input_name" id="subtitles_input_name" placeholder="input" />
             </div>
           </div>
         <br/>
@@ -13,26 +13,38 @@
       </div>
     </div>
 
+    <div class="well">
+    <fieldset>
+      <legend>Subtitles file (.srt)</legend>
+        <div class="form-group">
+        <label class="control-label" for="subtitles_name">Subtitles</label>
+          <div class="controls">
+          <input type="text" name="subtitles_name" id="subtitles_name" placeholder="subtitles" />
+          </div>
+        </div>
+    </fieldset>
+    </div>
+
     <div class="well">
     <fieldset>
       <legend>Output</legend>
         <div class="form-group">
-          <label class="control-label" for="output_name">Output</label>
+        <label class="control-label" for="subtitles_output_name">Output</label>
           <div class="controls">
-            <input type="text" name="output_name" id="output_name" placeholder="output" />
+          <input type="text" name="subtitles_output_name" id="subtitles_output_name" placeholder="output" />
           </div>
         </div>
+          </fieldset>
           <br/>
-        <input type="button" class="btn btn-large btn-primary" name="display_generate" id="add_subtitles_generate" value="Generate" />
+          <fieldset>
+      <input type="button" class="btn btn-large btn-primary" name="add_subtitles_generate" id="add_subtitles_generate" value="Generate" />
           </fieldset>
     </div>
 
     <div class="well">
       <fieldset>
         <legend>Your command line:</legend>
-          <textarea name="command_line" id="command_line" rows="3" cols="100"></textarea>
+        <textarea name="subtitles_command_line" id="subtitles_command_line" rows="3" cols="100"></textarea>
       </fieldset>
     </div>
 
-
-    </div> <!-- container -->

app/views/forms/_display_info.html.erb

@@ -21,4 +21,4 @@
     </fieldset>
   </div>
 
-    </div> <!-- container -->
+</div> <!-- container -->

app/views/forms/_remove_audio_track.html.erb

@@ -0,0 +1,51 @@
+    <div id="file_names">
+      <div class="well">
+      <fieldset>
+        <legend>Input</legend>
+          <div class="form-group">
+          <label class="control-label" for="input_name">Input</label>
+            <div class="controls">
+            <input type="text" name="input_name" id="input_name" placeholder="input" />
+            </div>
+          </div>
+        <br/>
+      </fieldset>
+      </div>
+    </div>
+
+    <div class="well">
+    <fieldset>
+      <legend>Subtitles file (.srt)</legend>
+        <div class="form-group">
+        <label class="control-label" for="subtitles_name">Subtitles</label>
+          <div class="controls">
+          <input type="text" name="subtitles_name" id="subtitles_name" placeholder="subtitles" />
+          </div>
+        </div>
+    </fieldset>
+    </div>
+
+    <div class="well">
+    <fieldset>
+      <legend>Output</legend>
+        <div class="form-group">
+        <label class="control-label" for="output_name">Output</label>
+          <div class="controls">
+          <input type="text" name="output_name" id="output_name" placeholder="output" />
+          </div>
+        </div>
+          </fieldset>
+          <br/>
+          <fieldset>
+      <input type="button" class="btn btn-large btn-primary" name="add_subtitles_generate" id="add_subtitles_generate" value="Generate" />
+          </fieldset>
+    </div>
+
+    <div class="well">
+      <fieldset>
+        <legend>Your command line:</legend>
+        <textarea name="subtitles_command_line" id="subtitles_command_line" rows="3" cols="100"></textarea>
+      </fieldset>
+    </div>
+
+  </div> <!-- container -->

app/views/forms/_web.html.erb

@@ -1,4 +1,4 @@
-      <div id="file_names">
+<div id="file_names">
   
   <div class="well">
   <fieldset>
@@ -19,13 +19,13 @@
     <input type="button" class="btn btn-large btn-primary" name="generate" id="web_generate" value="Generate" />
   </fieldset>
   </div>
-      </div>
+</div>
 
-      <div class="well">
+<div class="well">
   <fieldset>
     <legend>Your command line:</legend>
     <textarea name="command_line" id="command_line" rows="3" cols="100"></textarea>
   </fieldset>
-      </div>
+</div>
 
-    </div> <!-- container -->
+</div> <!-- container -->

app/views/forms/index.html.erb

@@ -1,24 +1,31 @@
     <div class="container">
+      <div class="text-center">
         <h1>➺ ffmproviser ❥</h1>
+      </div>
 
 <!-- form begins -->
 
       <div class="well">
         <fieldset>
           <legend>What do you want to do?</legend>
-          <h3>Select from the following.</h3>
+          <h4>Select from the following.</h4>
+          <br />
           <ul>
             <li>
               <div id="show_display_info">Display info</div>
             </li>
-            <li>
-              <div id="show_web">Export for web</div>
-            </li>
             <li>
               <div id="show_add_subtitles">Add subtitles track</div>
             </li>
-            <li>Remove audio track</li>
+            <li>
-            <li>Add audio track</li>
+              <div id="show_remove_audio_track">Remove audio track</div>
+            </li>
+            <li>
+              <div id="show_add_audio_track">Add audio track (replace)</div>
+            </li>
+            <li>
+              <div id="show_web"><s>Export for web</s></div>
+            </li>
           </ul>
         </fieldset>
        </div>
@@ -33,4 +40,10 @@
     <div class="add_subtitles" style="display:none;">
     <%= render "add_subtitles" %>
     </div>
+    <div class="remove_audio_track" style="display:none;">
+    <%= render "remove_audio_track" %>
+    </div>
+    <div class="add_audio_track" style="display:none;">
+    <%= render "add_audio_track" %>
+    </div>
   </div>

app/views/forms/remove_audio_track.html.erb

@@ -0,0 +1,51 @@
+    <div id="file_names">
+      <div class="well">
+      <fieldset>
+        <legend>Input</legend>
+          <div class="form-group">
+          <label class="control-label" for="r_audio_input_name">Input</label>
+            <div class="controls">
+            <input type="text" name="r_audio_input_name" id="r_audio_input_name" placeholder="input" />
+            </div>
+          </div>
+        <br/>
+      </fieldset>
+      </div>
+    </div>
+
+    <div class="well">
+    <fieldset>
+      <legend>Audio track</legend>
+        <div class="form-group">
+        <label class="control-label" for="r_audio_track_name">Audio track</label>
+          <div class="controls">
+          <input type="text" name="r_audio_track_name" id="r_audio_track_name" placeholder="subtitles" />
+          </div>
+        </div>
+    </fieldset>
+    </div>
+
+    <div class="well">
+    <fieldset>
+      <legend>Output</legend>
+        <div class="form-group">
+        <label class="control-label" for="r_audio_output_name">Output</label>
+          <div class="controls">
+          <input type="text" name="r_audio_output_name" id="r_audio_output_name" placeholder="output" />
+          </div>
+        </div>
+          </fieldset>
+          <br/>
+          <fieldset>
+      <input type="button" class="btn btn-large btn-primary" name="remove_subtitles_generate" id="remove_audio_track_generate" value="Generate" />
+          </fieldset>
+    </div>
+
+    <div class="well">
+      <fieldset>
+        <legend>Your command line:</legend>
+        <textarea name="remove_audio_track_command_line" id="remove_audio_track_command_line" rows="3" cols="100"></textarea>
+      </fieldset>
+    </div>
+
+  </div> <!-- container -->

app/views/layouts/application.html.erb

@@ -18,7 +18,8 @@
 
     <%= yield %>
 
-    <div class="footer">
+    
+    <div class="footer text-center">
       <p>Made with ♥ by <a href="http://www.ashleyblewer.com">Ashley Blewer</a></p>
     </div>
   </body>