0.1.18

README.md

@@ -51,7 +51,12 @@ Ever asked yourself which Editor you should choose? This is trying to answer tha
 
 ## Optional
 
-   - you need imagemagick installed on your machine to view images
+   - you need imagemagick installed on your machine to view images  
+   - for audio files and the beta video module you need avconv installed  
+   - for the X11 Terminal you need the following programs installed:  
+     avconv (optional just ffmpeg)  
+     xprop  
+     xdotool  
 
 
 ## Customizablity
@@ -72,6 +77,7 @@ Ever asked yourself which Editor you should choose? This is trying to answer tha
  - download directories as zip files  
  - Terminals (!)  
  - build in web server  
+ - a freakin X11 terminal forwarder (!!)  
  - more ...  
 
 
@@ -81,11 +87,22 @@ For every Content Type where a CodeMirror Mode exists, a CodeMirror instance wil
 For all other files there is a download button or a Hex Editor.  
 If a file is opened for which no native Text Mode exists it will be opened in a Hex Editor. You can switch between hex view and text view.
 
+## Audio / Video Files
+
+Audio and Video files are converted to a web format using avconv. make sure you have it installed.
+the Video module is beta.
+
 
 ## Terminal Module  
 
 utilizing pty.js nodeMirror allows you to have several terminals within your browser. the Terminals will stay open when you close your browser window. You can even have the same terminal open on different browsers / machines opening new possibilities for collaboration.   
 
+## X11 Terminal Module  
+
+a videostream encoded with avconv is forwarded to the client. client inputs are forwarded via xdotool.  
+make sure you have avconv, xprop and xdotool installed.  
+to activate the x11 module pass --x11terminal on the commandline. this feature stays optional because not every server has a x11 console.
+
 
 ## Debug Module  
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-mirror",
-  "version": "0.1.17",
+  "version": "0.1.18",
   "author": {
     "name": "Matthias Behrens",
     "email": "[email protected]"
@@ -38,6 +38,9 @@
     , "hexeditor"
     , "less"
     , "peg.js"
+    , "x11"
+    , "x11 terminal"
+    , "audio player"
   ],
   "repository": {
     "type": "git",

src/server/server.js

@@ -245,7 +245,7 @@ define([
           var spawn  = child_process.spawn;
 
           function s(p, p2){
-            return p[format] || p.default || p2;
+            return p[format] || p["default"] || p2;
           };
 
           x11size().then(function(size){
@@ -267,7 +267,7 @@ define([
               "-b:v","1M",             // Target bit rate
               "-crf","40",             // Quality
               "-t", "180", // 3 min
-              "-f", format,             // File format
+              "-f", format             // File format
             ];
               //console.log(nodeMirrorConfig.x11videotool);
             if (nodeMirrorConfig.x11videotool == "avconv"){