Update doc and examples

examples/express-stream.js

@@ -16,10 +16,15 @@ app.get('/video/:filename', function(req, res) {
   var proc = new ffmpeg({ source: pathToMovie, nolog: true })
     // use the 'flashvideo' preset (located in /lib/presets/flashvideo.js)
     .usingPreset('flashvideo')
-    // save to stream
-    .writeToStream(res, {end:true}, function(retcode, error){
+    // setup event handlers
+    .on('end', function() {
       console.log('file has been converted succesfully');
-    });
+    })
+    .on('error', function(err) {
+      console.log('an error happened: ' + err.message);
+    })
+    // save to stream
+    .writeToStream(res, {end:true});
 });
 
 app.listen(4000);

examples/full.js

@@ -22,7 +22,12 @@ var proc = new ffmpeg({ source: '/path/to/your_movie.avi', nolog: true })
   .addOption('-vtag', 'DIVX')
   // set output format to force
   .toFormat('avi')
-  // save to file
-  .saveToFile('/path/to/your_target.avi', function(retcode, error){
+  // setup event handlers
+  .on('end', function() {
     console.log('file has been converted succesfully');
-  });
+  })
+  .on('error', function(err) {
+    console.log('an error happened: ' + err.message);
+  })
+  // save to file
+  .saveToFile('/path/to/your_target.avi');

examples/image2video.js

@@ -6,7 +6,12 @@ var proc = new ffmpeg({ source: '/path/to/your_image.jpg', nolog: true })
   .loop(5)
   // using 25 fps
   .withFps(25)
-  // save to file
-  .saveToFile('/path/to/your_target.m4v', function(retcode, error){
+  // setup event handlers
+  .on('end', function() {
     console.log('file has been converted succesfully');
-  });
+  })
+  .on('error', function(err) {
+    console.log('an error happened: ' + err.message);
+  })
+  // save to file
+  .saveToFile('/path/to/your_target.m4v');

examples/input-stream.js

@@ -12,6 +12,12 @@ infs.on('error', function(err) {
 // instead of file path (can be any ReadableStream)
 var proc = new ffmpeg({ source: infs, nolog: true })
   .usingPreset('flashvideo')
-  .saveToFile('/path/to/your_target.flv', function(stdout, stderr, err) {
+  // setup event handlers
+  .on('end', function() {
     console.log('done processing input stream');
-  });
+  })
+  .on('error', function(err) {
+    console.log('an error happened: ' + err.message);
+  })
+  // save to file
+  .saveToFile('/path/to/your_target.flv');

examples/livertmp2hls.js

@@ -18,7 +18,12 @@ var proc = new ffmpeg({ source: 'rtmp://path/to/live/stream', nolog: true, timeo
   .addOption('-hls_time', 10)
   // include all the segments in the list
   .addOption('-hls_list_size',0)
-  // save to file
-  .saveToFile('/path/to/your_target.m3u8', function(retcode, error){
+  // setup event handlers
+  .on('end', function() {
     console.log('file has been converted succesfully');
-  });
+  })
+  .on('error', function(err) {
+    console.log('an error happened: ' + err.message);
+  })
+  // save to file
+  .saveToFile('/path/to/your_target.m3u8');

examples/mergeVideos.js

@@ -22,6 +22,10 @@ var proc = new ffmpeg({source:firstFile,nolog:true})
     .mergeAdd(thirdFile)
     //.mergeAdd(fourthFile)
     //.mergeAdd(...)
-    .mergeToFile(outPath,function(){
-        console.log('files have been merged successfully');
-    });
+    .on('end', function() {
+      console.log('files have been merged succesfully');
+    })
+    .on('error', function(err) {
+      console.log('an error happened: ' + err.message);
+    })
+    .mergeToFile(outPath);

examples/preset.js

@@ -6,7 +6,12 @@ var proc = new ffmpeg({ source: '/path/to/your_movie.avi', nolog: true })
   .usingPreset('podcast')
   // in case you want to override the preset's setting, just keep chaining
   .withVideoBitrate('512k')
-  // save to file
-  .saveToFile('/path/to/your_target.m4v', function(retcode, error){
+  // setup event handlers
+  .on('end', function() {
     console.log('file has been converted succesfully');
-  });
+  })
+  .on('error', function(err) {
+    console.log('an error happened: ' + err.message);
+  })
+  // save to file
+  .saveToFile('/path/to/your_target.m4v');

examples/progress.js

@@ -10,10 +10,14 @@ infs.on('error', function(err) {
 
 var proc = new ffmpeg({ source: infs, nolog: true })
   .usingPreset('flashvideo')
-  // set the callback for our progress notification
-  .onProgress(function(info) {
+  // setup event handlers
+  .on('progress', function(info) {
     console.log('progress ' + info.percent + '%');
   })
-  .saveToFile('/path/to/your_target.flv', function(stdout, stderr, err) {
+  .on('end', function() {
     console.log('done processing input stream');
-  });
+  })
+  .on('error', function(err) {
+    console.log('an error happened: ' + err.message);
+  })
+  .saveToFile('/path/to/your_target.flv');

examples/stream.js

@@ -8,7 +8,12 @@ var stream = fs.createWriteStream('/path/to/yout_target.flv')
 var proc = new ffmpeg({ source: '/path/to/your_movie.avi', nolog: true })
   // use the 'flashvideo' preset (located in /lib/presets/flashvideo.js)
   .usingPreset('flashvideo')
-  // save to stream
-  .writeToStream(stream, {end:true}, function(retcode, error){ //end = true, close output stream after writing
+  // setup event handlers
+  .on('end', function() {
     console.log('file has been converted succesfully');
-  });
+  })
+  .on('error', function(err) {
+    console.log('an error happened: ' + err.message);
+  })
+  // save to stream
+  .writeToStream(stream, {end:true}); //end = true, close output stream after writing

examples/thumbnails.js

@@ -3,7 +3,12 @@ var ffmpeg = require('../index');
 var proc = new ffmpeg({ source: '/path/to/your_movie.avi', nolog: true })
   // set the size of your thumbnails
   .withSize('150x100')
+  // setup event handlers
+  .on('end', function(files) {
+    console.log('screenshots were saved as ' + files.join(', '));
+  })
+  .on('error', function(err) {
+    console.log('an error happened: ' + err.message);
+  })
   // take 2 screenshots at predefined timemarks
-  .takeScreenshots({ count: 2, timemarks: [ '00:00:02.000', '6' ] }, '/path/to/thumbnail/folder', function(err) {
-    console.log('screenshots were saved');
-  });
+  .takeScreenshots({ count: 2, timemarks: [ '00:00:02.000', '6' ] }, '/path/to/thumbnail/folder');