Removing all files

12 files changed, 0 insertions, 3064 deletions

diff --git a/plugins/ffmpeg.inc b/plugins/ffmpeg.inc
deleted file mode 100644
index a83653a..0000000
--- a/plugins/ffmpeg.inc
+++ /dev/null
@@ -1,275 +0,0 @@
-<?php
-//$Id$
-
-/**
- * @file
- * Provide a api for video conversion and auto thumbnailing using ffmpeg.
- *
- * @author Heshan Wanigasooriya <heshan at heidisoft.com, heshanmw at gmail dot com>
- * TODO: add common settings from video module configurations and extend it from ffmpeg.inc
- * since we need to have executable path of ffmpeg to ffmpeg.inc we need to have it
- */
-
-/**
- * Define some constants
- */
-defined('VIDEO_RENDERING_PENDING')
-  or define('VIDEO_RENDERING_PENDING', 1);
-defined('VIDEO_RENDERING_ACTIVE')
-  or define('VIDEO_RENDERING_ACTIVE', 5);
-defined('VIDEO_RENDERING_COMPLETE')
-  or define('VIDEO_RENDERING_COMPLETE', 10);
-defined('VIDEO_RENDERING_FAILED')
-  or define('VIDEO_RENDERING_FAILED', 20);
-
-// nice value to append at the beginning of the command
-defined('VIDEO_RENDERING_NICE')
-  or define('VIDEO_RENDERING_NICE', 'nice -n 19');
-
-
-// TODO : add cron API to video module
-function ffmpeg_cron() {
-  global $base_url;
-
-  if(variable_get('video_ffmpeg_helper_auto_cvr_cron', true)) {
-    exec("php video_scheduler.php $base_url > /dev/null &");
-  }
-}
-
-
-/**
- * Get some informations from the video file
- */
-function ffmpeg_get_video_info($vidfile) {
-  static $ffmpeg_info;
-  $fid = $vidfile['fid'];
-  //  $command_output = cache_get($fid);
-  //  if(empty($command_output)) {
-  // escape file name for safety
-  $file = escapeshellarg($vidfile['filepath']);
-  // create the full command to execute
-  $command = variable_get('video_transcoder_path', '/usr/bin/ffmpeg') . ' -i ' . $file;
-
-  //execute the command
-  ob_start();
-  passthru($command." 2>&1", $command_return);
-  $command_output = ob_get_contents();
-  ob_end_clean();
-
-  // cache the result for further calls
-  //  $ffmpeg_info[$vidfile['fid']] = $command_output;
-  //    cache_set($vidfile['fid'], $command_output);
-  //  }
-
-  return $command_output;
-}
-
-
-/**
- * Return the video resolution
- */
-function ffmpeg_auto_resolution(&$node) {
-
-  if(!variable_get('video_ffmpeg_helper_auto_resolution', false)) {
-
-  // call ffmpeg -i
-    $ffmpeg_output = ffmpeg_get_video_info($node);
-
-    // get resolution
-    $pattern = '/Video: .*, ([0-9]{2,4}x[0-9]{2,4})/';
-    preg_match_all($pattern, $ffmpeg_output, $matches, PREG_PATTERN_ORDER);
-    $resolution = $matches[1][0];
-
-    return explode("x", $resolution);
-  }
-  return null;
-}
-
-
-/**
- * Return the playtime seconds of a video
- */
-function ffmpeg_auto_playtime($file) {
-
-  if(!variable_get('video_ffmpeg_helper_auto_playtime', false)) {
-
-  // call ffmpeg -i
-    $ffmpeg_output = ffmpeg_get_video_info($file);
-
-    // get playtime
-    $pattern = '/Duration: ([0-9]{2}:[0-9]{2}:[0-9]{2}\.[0-9])/';
-    preg_match_all($pattern, $ffmpeg_output, $matches, PREG_PATTERN_ORDER);
-    $playtime = $matches[1][0];
-
-    // ffmpeg return lenght as 00:00:31.1 Let's get playtime from that
-    $hmsmm = explode(":", $playtime);
-
-    $tmp = explode(".", $hmsmm[2]);
-    $seconds = $tmp[0];
-
-    $hours = $hmsmm[0];
-    $minutes = $hmsmm[1];
-
-    return $seconds + ($hours * 3600) + ($minutes * 60);
-  }
-}
-
-/**
- * Generates a thumbnail from the video file
- * Implementing hook_auto_thumbnail on inc
- *
- * @param $vidfile
- *   object with element information
- *
- * @return
- *   a drupal file objects
- */
-function ffmpeg_auto_thumbnail($vidfile) {
-  global $user;
-  $uploaded_file = $vidfile;
-  $fid = $uploaded_file["fid"];
-
-  // are we debugging?
-  // escape the filename for safety
-  $videofile = escapeshellarg($uploaded_file['filepath']);
-  $thumb_path = variable_get('video_thumb_path', 'video_thumbs');
-  //files will save in files/video_thumbs/#fileId folder
-  $tmp = file_directory_path(). '/' . $thumb_path . '/' . $fid;
-  // Ensure the destination directory exists and is writable.
-  $directories = explode('/', $tmp);
-  //  array_pop($directories); // Remove the file itself.
-  // Get the file system directory.
-  $file_system = file_directory_path();
-  foreach ($directories as $directory) {
-    $full_path = isset($full_path) ? $full_path . '/' . $directory : $directory;
-    // Don't check directories outside the file system path.
-    if (strpos($full_path, $file_system) === 0) {
-      field_file_check_directory($full_path, FILE_CREATE_DIRECTORY);
-    }
-  }
-  $count = variable_get('no_of_video_thumbs', 5);
-  $duration = ffmpeg_auto_playtime($vidfile);
-  $files = NULL;
-  for($i = 1; $i <= $count; $i++) {
-  // get ffmpeg configurations
-    $seek = ($duration/$count) * $i;
-    $thumbfile = $tmp . "/video-thumb-for-$fid-$i.png";
-    //skip files already exists, this will save ffmpeg traffic
-    if (!is_file($thumbfile)) {
-      $tnail = variable_get('video_transcoder_path', '/usr/bin/ffmpeg');
-      $options = preg_replace(array('/%videofile/', '/%thumbfile/', '/%seek/'), array($videofile, $thumbfile, $seek), variable_get('video_ffmpeg_thumbnailer_options', '-i %videofile -an -y -f mjpeg -ss %seek -vframes 1 %thumbfile'));
-      //    $options = preg_replace(array('/%videofile/', '/%tmp/', '/%id/', '/%interval/'), array($videofile, $tmp, $i, ($duration/$count)), variable_get('video_image_thumbnailer_options', '-ss %id*%interval -i %videofile -vframes 1 %thumbfile'));
-      //  ffmpeg -ss $i*$interval -i intro.mov -vframes 1 -s 320x240 thumb_$i.jpg
-      //ffmpeg -i superstunt_8uiarzrh.mp4 -r 0.1 -ss 00:00:5 -f image2 img/images%02d.png
-      ////ffmpeg -i superstunt_8uiarzrh.mp4 -r 0.05 -ss 00:00:5 -f image2 img/images%1d.jpg
-      // executes the command
-      $command = "$tnail $options";
-      ob_start();
-      passthru($command." 2>&1", $tnail_return);
-      $tnail_output = ob_get_contents();
-      ob_end_clean();
-      if (!file_exists($thumbfile)) {
-        $error_param = array(
-            '%file' => $thumbfile,
-            '%cmd' => $command,
-            '%out' => $tnail_output,
-        );
-        $error_msg = t("error generating thumbnail for video: generated file %file does not exist.<br />Command Executed:<br />%cmd<br />Command Output:<br />%out", $error_param);
-        // let's log this
-        watchdog('video_ffmpeg',$error_msg, array(), WATCHDOG_ERROR);
-      }
-    }
-    // Begin building file object.
-    //TODO : use file_munge_filename()
-    $file = new stdClass();
-    $file->uid      = $user->uid;
-    $file->status   = FILE_STATUS_TEMPORARY;
-    $file->filename = trim("video-thumb-for-$fid-$i.png");
-    $file->filepath = $thumbfile;
-    $file->filemime = file_get_mimetype("video-thumb-for-$fid-$i.png");
-    $file->filesize = filesize($thumbfile);
-    $file->timestamp = REQUEST_TIME;
-    $files[] = $file;
-  }
-  return $files;
-}
-
-/**
- * Implementing hook_chcek_exepath() on inc
- * To check the the path is executable or not
- * @param <type> path to check
- * @return bool TRUE/FALSE
- */
-function ffmpeg_check_exe_path($path=NULL) {
-  if (!$path) {
-    $path = variable_get('video_transcoder_path', '/usr/bin/ffmpeg');
-  }
-  if (function_exists('is_executable')) {
-    $test = 'is_executable';
-  } else {
-    $test = 'file_exists';
-  }
-  return $test($path);
-}
-
-/**
- * Implementing hook_auto_convert();
- * @param <type> $job
- */
-function ffmpeg_auto_convert(&$job) {
-  $videofile = escapeshellarg($job->filepath); // escape file name for safety
-  $convfile = tempnam(file_directory_temp(), 'video-rendering');
-  $audiobitrate = variable_get('video_ffmpeg_helper_auto_cvr_audio_bitrate', 64);
-  $videobitrate = variable_get('video_ffmpeg_helper_auto_cvr_video_bitrate', 200);
-  $size = _video_render_get_size();
-  $converter = variable_get('video_transcoder_path', '/usr/bin/ffmpeg');
-  
-  $options = preg_replace(array('/%videofile/', '/%convertfile/', '/%audiobitrate/', '/%size/', '/%videobitrate/'),
-      array($videofile, $convfile, $audiobitrate, $size, $videobitrate),
-      variable_get('video_ffmpeg_helper_auto_cvr_options',
-      '-y -i %videofile -f flv -ar 22050 -ab %audiobitrate -s %size -b %videobitrate -qscale 1 %convertfile'));
-
-  // set to the converted file output
-  $job->convfile = $convfile;
-
-  $command = VIDEO_RENDERING_NICE . " $converter $options";
-
-  //print('executing ' . $command); die;
-  watchdog('video_render', 'executing: ' . $command, array(), WATCHDOG_DEBUG);
-//   watchdog('video_render', 'Starting : ' . REQUEST_TIME);
-  //execute the command
-  ob_start();
-  passthru($command." 2>&1", $command_return);
-  $command_output = ob_get_contents();
-  ob_end_clean();
-//  watchdog('video_render', 'Completed');
-  //print $command_output;
-
-  if (!file_exists($job->convfile) || !filesize($job->convfile)) {
-    watchdog('video_render', 'video conversion failed. ffmpeg reported the following output: ' . $command_output, array(), WATCHDOG_ERROR);
-  //    _video_render_set_video_encoded_fid($job->nid, $job->vid, -1);
-  //    _video_render_job_change_status($job->nid, $job->vid, VIDEO_RENDERING_FAILED);
-  }
-  else {
-    $file_name = basename($job->filename . ".flv");
-    $file = new stdClass();
-    $file->uid      = $job->uid;
-    $file->status   = FILE_STATUS_PERMANENT;
-    $file->filename = basename($file_name);
-    $file->filepath = $job->convfile;
-    $file->filemime = file_get_mimetype($file_name);
-    $file->filesize = filesize($job->convfile);
-    $file->timestamp = REQUEST_TIME;
-    
-    $job->converted = $file;
-  }
-}
-
-
-/**
- * Calculate the converted video size basing on the width set on administration.
- * Aspect ration is maintained.
- */
-function _video_render_get_size() {
-  return variable_get('video_ffmpeg_width', 640) . 'x' . variable_get('video_ffmpeg_height', 480);
-}
\ No newline at end of file
diff --git a/plugins/ffmpeg_wrapper.inc b/plugins/ffmpeg_wrapper.inc
deleted file mode 100644
index fd98e64..0000000
--- a/plugins/ffmpeg_wrapper.inc
+++ /dev/null
@@ -1,406 +0,0 @@
-<?php
-//$Id$
-
-/**
- * @file
- * Provide a api for video conversion and auto thumbnailing using ffmpeg.
- *
- * You must have ffmpeg_wrapper module installed in order to use this
- *
- * @author Heshan Wanigasooriya <heshan at heidisoft.com, heshanmw at gmail dot com>
- */
-
-/**
- * Define some constants
- */
-defined('VIDEO_RENDERING_PENDING')
-  or define('VIDEO_RENDERING_PENDING', 1);
-defined('VIDEO_RENDERING_ACTIVE')
-  or define('VIDEO_RENDERING_ACTIVE', 5);
-defined('VIDEO_RENDERING_COMPLETE')
-  or define('VIDEO_RENDERING_COMPLETE', 10);
-defined('VIDEO_RENDERING_FAILED')
-  or define('VIDEO_RENDERING_FAILED', 20);
-
-// nice value to append at the beginning of the command
-defined('VIDEO_RENDERING_NICE')
-  or define('VIDEO_RENDERING_NICE', 'nice -n 19');
-
-
-// TODO : add cron API to video module
-function ffmpeg_wrapper_cron() {
-  global $base_url;
-
-  if(variable_get('video_ffmpeg_helper_auto_cvr_cron', true)) {
-    exec("php video_scheduler.php $base_url > /dev/null &");
-  }
-}
-
-
-/**
- * Get some informations from the video file
- */
-function ffmpeg_wrapper_get_video_info($vidfile) {
-  static $ffmpeg_info;
-  $fid = $vidfile['fid'];
-  //  $command_output = cache_get($fid);
-  //  if(empty($command_output)) {
-  // escape file name for safety
-  $file = escapeshellarg($vidfile['filepath']);
-  // create the full command to execute
-  $command = variable_get('video_transcoder_path', '/usr/bin/ffmpeg') . ' -i ' . $file;
-
-  //execute the command
-  ob_start();
-  passthru($command." 2>&1", $command_return);
-  $command_output = ob_get_contents();
-  ob_end_clean();
-
-  // cache the result for further calls
-  //  $ffmpeg_info[$vidfile['fid']] = $command_output;
-  //    cache_set($vidfile['fid'], $command_output);
-  //  }
-
-  return $command_output;
-}
-
-
-/**
- * Return the video resolution
- */
-function ffmpeg_wrapper_auto_resolution(&$vidfile) {
-
-  if(!variable_get('video_ffmpeg_helper_auto_resolution', false)) {
-
-  // call ffmpeg -i
-    $filepath = escapeshellarg($vidfile['filepath']);
-    $ffmpeg_output = ffmpeg_wrapper_file_data($filepath);
-
-    // get resolution
-    $pattern = '/Video: .*, ([0-9]{2,4}x[0-9]{2,4})/';
-    preg_match_all($pattern, $ffmpeg_output, $matches, PREG_PATTERN_ORDER);
-    $resolution = $matches[1][0];
-
-    return explode("x", $resolution);
-  }
-  return null;
-}
-
-
-/**
- * Return the playtime seconds of a video
- */
-function ffmpeg_wrapper_auto_playtime($file) {
-
-  if(!variable_get('video_ffmpeg_helper_auto_playtime', false)) {
-
-  // call ffmpeg -i
-    $ffmpeg_output = ffmpeg_wrapper_get_video_info($file);
-
-    // get playtime
-    $pattern = '/Duration: ([0-9]{2}:[0-9]{2}:[0-9]{2}\.[0-9])/';
-    preg_match_all($pattern, $ffmpeg_output, $matches, PREG_PATTERN_ORDER);
-    $playtime = $matches[1][0];
-
-    // ffmpeg return lenght as 00:00:31.1 Let's get playtime from that
-    $hmsmm = explode(":", $playtime);
-
-    $tmp = explode(".", $hmsmm[2]);
-    $seconds = $tmp[0];
-
-    $hours = $hmsmm[0];
-    $minutes = $hmsmm[1];
-
-    return $seconds + ($hours * 3600) + ($minutes * 60);
-  }
-}
-
-/**
- * Generates a thumbnail from the video file
- * Implementing hook_auto_thumbnail on inc
- *
- * @param $vidfile
- *   object with element information
- *
- * @return
- *   a drupal file objects
- */
-function ffmpeg_wrapper_auto_thumbnail($vidfile) {
-  global $user;
-  $uploaded_file = $vidfile;
-  $fid = $uploaded_file["fid"];
-
-  // are we debugging?
-  // escape the filename for safety
-  $videofile = escapeshellarg($uploaded_file['filepath']);
-  $thumb_path = variable_get('video_thumb_path', 'video_thumbs');
-  //files will save in files/video_thumbs/#fileId folder
-  $tmp = file_directory_path(). '/' . $thumb_path . '/' . $fid;
-  // Ensure the destination directory exists and is writable.
-  $directories = explode('/', $tmp);
-  //  array_pop($directories); // Remove the file itself.
-  // Get the file system directory.
-  $file_system = file_directory_path();
-  foreach ($directories as $directory) {
-    $full_path = isset($full_path) ? $full_path . '/' . $directory : $directory;
-    // Don't check directories outside the file system path.
-    if (strpos($full_path, $file_system) === 0) {
-      field_file_check_directory($full_path, FILE_CREATE_DIRECTORY);
-    }
-  }
-  $count = variable_get('no_of_video_thumbs', 5);
-  // set file path
-  $filepath = $vidfile['filepath'];
-  // calling ffmpeg_wrapper_file_data function
-  $file_data = ffmpeg_wrapper_file_data($filepath);
-  $duration = $file_data['duration'];
-  $files = NULL;
-  for($i = 1; $i <= $count; $i++) {
-  // get ffmpeg configurations
-    $seek = ($duration/$count) * $i;
-    $thumbfile = $tmp . "/video-thumb-for-$fid-$i.png";
-    //skip files already exists, this will save ffmpeg traffic
-    if (!is_file($thumbfile)) {
-//      $tnail = variable_get('video_transcoder_path', '/usr/bin/ffmpeg');
-      $options = preg_replace(array('/%videofile/', '/%thumbfile/', '/%seek/'), array($videofile, $thumbfile, $seek), variable_get('video_ffmpeg_thumbnailer_options', '-i %videofile -an -y -f mjpeg -ss %seek -vframes 1 %thumbfile'));
-      // executes the command
-      $tnail_output = ffmpeg_wrapper_run_command($options, $error_check = true, $path = '');
-//      $command = "$tnail $options";
-//      ob_start();
-//      passthru($command." 2>&1", $tnail_return);
-//      $tnail_output = ob_get_contents();
-//      ob_end_clean();
-      if (!file_exists($thumbfile)) {
-        $error_param = array(
-            '%file' => $thumbfile,
-            '%cmd' => $options,
-            '%out' => $tnail_output,
-        );
-        $error_msg = t("error generating thumbnail for video: generated file %file does not exist.<br />Command Executed:<br />%cmd<br />Command Output:<br />%out", $error_param);
-        // let's log this
-        watchdog('video_ffmpeg',$error_msg);
-      }
-    }
-    // Begin building file object.
-    //TODO : use file_munge_filename()
-    $file = new stdClass();
-    $file->uid      = $user->uid;
-    $file->status   = FILE_STATUS_TEMPORARY;
-    $file->filename = trim("video-thumb-for-$fid-$i.png");
-    $file->filepath = $thumbfile;
-    $file->filemime = file_get_mimetype("video-thumb-for-$fid-$i.png");
-    $file->filesize = filesize($thumbfile);
-    $file->timestamp = REQUEST_TIME;
-    $files[] = $file;
-  }
-  return $files;
-}
-
-/**
- * Implementing hook_chcek_exepath() on inc
- * To check the the path is executable or not
- * @param <type> path to check
- * @return bool TRUE/FALSE
- */
-function ffmpeg_wrapper_check_exe_path($path = NULL) {
-  return ffmpeg_wrapper_executable();
-}
-
-/**
- * Implementing hook_auto_convert();
- * @param <type> $job
- */
-//function ffmpeg_wrapper_auto_convert(&$job) {
-//  $videofile = escapeshellarg($job->filepath); // escape file name for safety
-//  $convfile = tempnam(file_directory_temp(), 'video-rendering');
-//  $audiobitrate = variable_get('video_ffmpeg_helper_auto_cvr_audio_bitrate', 64);
-//  $videobitrate = variable_get('video_ffmpeg_helper_auto_cvr_video_bitrate', 200);
-//  $size = _video_render_get_size();
-////  $converter = variable_get('video_transcoder_path', '/usr/bin/ffmpeg');
-//
-//  $options = preg_replace(array('/%videofile/', '/%convertfile/', '/%audiobitrate/', '/%size/', '/%videobitrate/'),
-//      array($videofile, $convfile, $audiobitrate, $size, $videobitrate),
-//      variable_get('video_ffmpeg_helper_auto_cvr_options',
-//      '-y -i %videofile -f flv -ar 22050 -ab %audiobitrate -s %size -b %videobitrate -qscale 1 %convertfile'));
-//
-//  // set to the converted file output
-//  $job->convfile = $convfile;
-//
-//  // run conversion commands from ffmpeg_wrapper module
-//  $command_output = ffmpeg_wrapper_run_command($options, $error_check = true, $path = '');
-//
-////  $command = VIDEO_RENDERING_NICE . " $converter $options";
-//
-//  //print('executing ' . $command); die;
-//  watchdog('video_render', 'executing: ' . $options);
-////   watchdog('video_render', 'Starting : ' . REQUEST_TIME);
-//  //execute the command
-////  ob_start();
-////  passthru($command." 2>&1", $command_return);
-////  $command_output = ob_get_contents();
-////  ob_end_clean();
-////  watchdog('video_render', 'Completed');
-//  //print $command_output;
-//
-//  if (!file_exists($job->convfile) || !filesize($job->convfile)) {
-//    watchdog('video_render', 'video conversion failed. ffmpeg reported the following output: ' . $command_output);
-//  //    _video_render_set_video_encoded_fid($job->nid, $job->vid, -1);
-//  //    _video_render_job_change_status($job->nid, $job->vid, VIDEO_RENDERING_FAILED);
-//  }
-//  else {
-//    $file_name = basename($job->filename . ".flv");
-//    $file = new stdClass();
-//    $file->uid      = $job->uid;
-//    $file->status   = FILE_STATUS_PERMANENT;
-//    $file->filename = basename($file_name);
-//    $file->filepath = $job->convfile;
-//    $file->filemime = file_get_mimetype($file_name);
-//    $file->filesize = filesize($job->convfile);
-//    $file->timestamp = REQUEST_TIME;
-//
-//    $job->converted = $file;
-//  }
-//}
-
-
-/**
- * This runs FFmpeg based on the form data passed into it.
- * @param string $input_file
- *   path to the file to operate on
- * @param array $params
- *   configuration options in the format set in the ffmpeg_wrapper_configuration_form()
- * @param string $output_file_path
- *   where to place the file, assumes same dir as $input_file. No trailing slash
- * @param object $ffmpeg_object
- *   contains debug information that calling functions can utilize
- * @return string
- *
- */
-function ffmpeg_wrapper_auto_convert(&$job) {
-
-  $ffmpeg_object = new stdClass();
-  // check configuration are pass of then use global $conf
-  if(empty ($params)){
-    global $conf;
-    $params = $conf;
-  }
-
-  $input_file = $job->filepath; // escape file name for safety
-
-  // first error check, make sure that we can decode this kind of file
-  if (! ffmpeg_wrapper_can_decode($input_file)) {
-    $message = 'FFmpeg Wrapper can not decode this file: !file';
-    $variables = array('!file' => l($input_file, file_create_url($input_file)));
-    watchdog('video_render', $message, $variables, WATCHDOG_ERROR);
-    $ffmpeg_object->errors[] = $message;
-    return false;
-  }
-
-  // build the output file path if we don't have one. Use the output type as the extension.
-  $output_file = file_create_filename(basename($input_file) .'.'. $params['ffmpeg_output_type'], ($output_file_path ? $output_file_path : dirname($input_file)));
-
-  // did the admin define a specific FFmpeg comand to run?
-  //  we only run what the admin specified
-  if ($params['ffmpeg_video_custom']) {
-    $options[] = str_replace(array('%in_file', '%out_file'), array($input_file, $output_file), $params['ffmpeg_video_custom_command']);
-  }
-  // build a standard configuration
-  else {
-    // build the ffmpeg command structure out
-    $options = array();
-
-    // input file
-    $options[] = "-i '". $input_file ."'";
-
-    // build the watermark config
-    if ($params['ffmpeg_video_wm']) {
-      $options[] = "-vhook '". ffmpeg_wrapper_path_to_vhook('watermark.so') ." -f ". $params['ffmpeg_video_wm_file'] ."'";
-    }
-
-    // build the audio config
-    if ($params['ffmpeg_audio_advanced']) {
-
-      // use a specifc codec?
-      if ($params['ffmpeg_audio_acodec']) {
-        $options[] =  '-acodec '. $params['ffmpeg_audio_acodec'];
-      }
-
-      // use a specific sample rate?
-      if ($params['ffmpeg_audio_ar'] ) {
-        $options[] = '-ar '. $params['ffmpeg_audio_ar'];
-      }
-
-      // use a specific bit rate?
-      if ($params['ffmpeg_audio_ab']) {
-        $options[] = '-ab '. $params['ffmpeg_audio_ab'];
-      }
-    }
-
-    // build the video config
-    if ($params['ffmpeg_video_advanced']) {
-
-      // is codec set?
-      if ($params['ffmpeg_video_vcodec']) {
-        $options[] = '-vcodec '. $params['ffmpeg_video_vcodec'];
-      }
-
-      // is frame size set?
-      if ($params['ffmpeg_video_size']) {
-        $options[] = '-s '. $params[$params['ffmpeg_video_size'] == 'other' ? 'ffmpeg_video_size_other' : 'ffmpeg_video_size'];
-      }
-
-      // is the bit rate set?
-      if ($params['ffmpeg_video_br']) {
-        $options[] = '-b '. $params['ffmpeg_video_br'];
-      }
-
-      // is frame rate set?
-      if ($params['ffmpeg_video_fps']) {
-        $options[] = '-r '. $params['ffmpeg_video_fps'];
-      }
-    }
-
-    // implement truncating
-    if ($params['ffmpeg_time_advanced']) {
-      $options[] = '-t '. $params['ffmpeg_time'];
-    }
-
-    // add the output file
-    $options[] = "'". $output_file ."'";
-  }
-
-  $ffmpeg_object->command = implode(" ", $options);
-
-  // run ffmpeg with error checking
-  if (! $success = ffmpeg_wrapper_run_command($ffmpeg_object->command)) {
-    watchdog('video_render', 'video conversion failed. ffmpeg reported the following output: ' . $success);
-    return false;
-  }
-
-  // successful convert, make a note in the log
-  $message = 'FFmpeg converted this file: @file';
-  $message .= '<br />'. 'FFmpeg ran this command: <br /><pre> !command </pre>';
-  $variables = array('@file' => $output_file, '!command' =>  $ffmpeg_object->command);
-  watchdog('video_render', $message, $variables, WATCHDOG_NOTICE);
-
-  $ffmpeg_object->output_file = $output_file;
-
-  if (!file_exists($output_file) || !filesize($output_file)) {
-    watchdog('video_render', 'video conversion failed. ffmpeg reported the following output: ' . $command_output);
-  //    _video_render_set_video_encoded_fid($job->nid, $job->vid, -1);
-  //    _video_render_job_change_status($job->nid, $job->vid, VIDEO_RENDERING_FAILED);
-  }
-  else {
-    $file_name = basename($output_file);
-    $file = new stdClass();
-    $file->uid      = $job->uid;
-    $file->status   = FILE_STATUS_PERMANENT;
-    $file->filename = basename($file_name);
-    $file->filepath = $output_file;
-    $file->filemime = file_get_mimetype($file_name);
-    $file->filesize = filesize($output_file);
-    $file->timestamp = REQUEST_TIME;
-
-    $job->converted = $file;
-  }
-}
diff --git a/plugins/video_zencoder/includes/LICENSE b/plugins/video_zencoder/includes/LICENSE
deleted file mode 100644
index d1f0a51..0000000
--- a/plugins/video_zencoder/includes/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2010 Zencoder
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/plugins/video_zencoder/includes/README.markdown b/plugins/video_zencoder/includes/README.markdown
deleted file mode 100644
index 0be2256..0000000
--- a/plugins/video_zencoder/includes/README.markdown
+++ /dev/null
@@ -1,199 +0,0 @@
-Zencoder API PHP Library
-==========================
-
-Author:  [Steve Heffernan](http://www.steveheffernan.com) (steve (a) zencoder (.) c&#1;om)  
-Company: [Zencoder - Online Video Encoder](http://zencoder.com)  
-Version: 1.1  
-Date:    2010-06-04  
-Repository: <http://github.com/zencoder/zencoder-php/>  
-
-For more details on the Zencoder API requirements visit  
-<http://zencoder.com/docs/api>
-
-
-ENCODING JOB
-------------
-The ZencoderJob object creates an encoding job using [cURL](http://zencoder.com/docs/glossary/curl/)
-to send [JSON](http://zencoder.com/docs/glossary/json/) formatted parameters to Zencoder's encoding API.
-
-### Step 1
-Visit the [API builder](https://app.zencoder.com/api_builder) in your account,
-and execute a successful encoding job.
-
-### Step 2
-Copy the successful JSON string, starting with the first curly brace "{",
-and pass it as the parameters for a new ZencoderJob object. Execute the script on your server to test that it works.
-
-#### Example
-    <pre>
-    <?php
-
-    // Make sure this points to a copy of Zencoder.php on the same server as this script.
-    require_once("zencoder-php/Zencoder.php");
-
-    // New Encoding Job
-    $encoding_job = new ZencoderJob('
-      {
-        "api_key": "93h630j1dsyshjef620qlkavnmzui3",
-        "input": "s3://bucket-name/file-name.avi"
-        "outputs": [
-          {
-            "label": "web"
-          }
-        ]
-      }
-    ');
-
-    // Check if it worked
-    if ($encoding_job->created) {
-      // Success
-      echo "w00t! \n\n";
-      echo "Job ID: ".$encoding_job->id."\n";
-      echo "Output '".$encoding_job->outputs["web"]->label."' ID: ".$encoding_job->outputs["web"]->id."\n";
-      // Store Job/Output IDs to update their status when notified or to check their progress.
-    } else {
-      // Failed
-      echo "Fail :(\n\n";
-      echo "Errors:\n";
-      foreach($encoding_job->errors as $error) {
-        echo $error."\n";
-      }
-    }
-
-    echo "\nAll Job Attributes:\n";
-    var_dump($encoding_job);
-
-    ?>
-    </pre>
-
-### Step 3
-Modify the above script to meet your needs.  
-Your [API Request History](https://app.zencoder.com/api_requests) may come in handy.  
-You can revisit your [API builder](https://app.zencoder.com/api_builder) to add/update parameters of the JSON.  
-
-You can translate the JSON string into nested associative arrays so that you can dynamically change attributes like "input".  
-The previous JSON example would become:
-
-    $encoding_job = new ZencoderJob(array(
-      "api_key" => "93h630j1dsyshjef620qlkavnmzui3",
-      "input" => "s3://bucket-name/file-name.avi",
-      "outputs" => array(
-        array(
-          "label" => "web"
-        )
-      )
-    ));
-
-
-GENERAL API REQUESTS
---------------------
-A general API request can be used for all API functionality including **Job Listing**, **Job Details**, **Account Creation**, **Account Details** (even Job Creation if desired). See the [API docs](http://zencoder.com/docs/api/) for all possible API requests.
-The first argument is the **API URL**.  
-The second argument is your **API Key**.  
-The third argument is the **request parameters** if needed. It can either be a JSON string or an array of parameters.
-
-
-#### Example Job List Request
-
-    $request = new ZencoderRequest(
-      'https://app.zencoder/api/jobs',
-      '93h630j1dsyshjef620qlkavnmzui3'
-    );
-
-    if ($request->successful) {
-      print_r($request->results);
-    } else {
-      foreach($request->errors as $error) {
-        echo $error."\n";
-      }
-    }
-
-#### Example Account Creation Request
-
-    $request = new ZencoderRequest(
-      'https://app.zencoder/api/account', 
-      false, // API key isn't needed for new account creation
-      array(
-        "terms_of_service" => "1",
-        "email" => "test@example.com",
-        "password" => "1234"
-      )
-    );
-
-    if ($request->successful) {
-      print_r($request->results);
-    } else {
-      foreach($request->errors as $error) {
-        echo $error."\n";
-      }
-    }
-
-
-NOTIFICATION HANDLING
-----------------------
-The ZencoderOutputNotification class is used to capture and parse JSON data sent from
-Zencoder to your app when an output file has been completed.
-
-
-
-### Step 1
-Create a script to receive notifications, and upload it to a location on your server that is publicly accessible.
-
-#### Example
-    <?php
-
-    // Make sure this points to a copy of Zencoder.php on the same server as this script.
-    require("Zencoder.php");
-
-    // Catch notification
-    $notification = ZencoderOutputNotification::catch_and_parse();
-
-    // Check output/job state
-    if($notification->output->state == "finished") {
-      echo "w00t!\n";
-
-      // If you're encoding to multiple outputs and only care when all of the outputs are finished
-      // you can check if the entire job is finished.
-      if($notification->job->state == "finished") {
-        echo "Dubble w00t!";
-      }
-    } elseif ($notification->output->state == "cancelled") {
-      echo "Cancelled!\n";
-    } else {
-      echo "Fail!\n";
-      echo $notification->output->error_message."\n";
-      echo $notification->output->error_link;
-    }
-
-    ?>
-
-### Step 2
-In the parameters for an encoding job, add the URL for your script to the notifications array of each output you want to be notified for. 
-Then submit the job to test if it works.  
-
-**You can view the results at:**  
-<https://app.zencoder.com/notifications>
-
-#### Example
-    ...
-    "outputs" => array(
-      array(
-        "label" => "web",
-        "notifications" => array("http://example.com.com/encoding/notification.php")
-      ),
-      array(
-        "label" => "iPhone",
-        "notifications" => array("http://example.com.com/encoding/notification.php")
-      )
-    )
-    ...
-
-
-### Step 3
-Modify the above script to meet your needs.  
-Your [notifications page](https://app.zencoder.com/notifications) will come in handy.
-
-VERSIONS
----------
-    Version 1.1 - 2010-06-04    Added General API Requests
-    Version 1.0 - 2010-04-02    Jobs and Notifications.
\ No newline at end of file
diff --git a/plugins/video_zencoder/includes/Zencoder.php b/plugins/video_zencoder/includes/Zencoder.php
deleted file mode 100644
index df52526..0000000
--- a/plugins/video_zencoder/includes/Zencoder.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-/*
-
-  Zencoder API PHP Library
-  Version: 1.0
-  See the README file for info on how to use this library.
-
-*/
-define('ZENCODER_LIBRARY_NAME',  "ZencoderPHP");
-define('ZENCODER_LIBRARY_VERSION',  "1.0");
-
-// Add JSON functions for PHP < 5.2.0
-if(!function_exists('json_encode')) {
-  require_once('lib/JSON.php');
-  $GLOBALS['JSON_OBJECT'] = new Services_JSON(SERVICES_JSON_LOOSE_TYPE);
-  function json_encode($value) { return $GLOBALS['JSON_OBJECT']->encode($value); }
-  function json_decode($value) { return $GLOBALS['JSON_OBJECT']->decode($value); }
-}
-
-class ZencoderJob {
-
-  var $new_job_url = "https://app.zencoder.com/api/jobs"; //https://app.zencoder.com/api/jobs
-  //https://zencoder-staging.heroku.com/api/jobs
-  var $new_job_params = array();
-  var $new_job_json;
-  var $created = false;
-  var $errors = array();
-
-  // Attributes
-  var $id;
-  var $outputs = array();
-
-  // Initialize
-  function ZencoderJob($params, $options = array()) {
-
-    // Build using params if not sending request
-    if($options["build"]) {
-      $this->update_attributes($params);
-      return true;
-    }
-
-    $this->new_job_params = $params;
-    $this->created = $this->create();
-  }
-
-  // Send Job Request to API
-  function create() {
-    // Send request
-    $request = new ZencoderRequest($this->new_job_url, false, $this->new_job_params);
-
-    if($request->successful) {
-      $this->update_attributes($request->results);
-      return true;
-    } else {
-      $this->errors = array_merge($this->errors, $request->errors);
-      return false;
-    }
-  }
-
-  // Add/Update attributes on the job object.
-  function update_attributes($attributes = array()) {
-    foreach($attributes as $attr_name => $attr_value) {
-      // Create output file objects
-      if($attr_name == "outputs" && is_array($attr_value)) {
-        $this->create_outputs($attr_value);
-      } elseif (!function_exists($this->$attr_name)) {
-        $this->$attr_name = $attr_value;
-      }
-    }
-  }
-
-  // Create output file objects from returned parameters.
-  // Use the Label for the key if avaiable.
-  function create_outputs($outputs = array()) {
-    foreach($outputs as $output_attrs) {
-      if($output_attrs["label"]) {
-        $this->outputs[$output_attrs["label"]] = new ZencoderOutputFile($output_attrs);
-      } else {
-        $this->outputs[] = new ZencoderOutputFile($output_attrs);
-      }
-    }
-  }
-}
-
-class ZencoderOutputFile {
-
-  var $id;
-  var $label;
-  var $url;
-  var $state;
-  var $error_message;
-  var $error_link;
-
-  function ZencoderOutputFile($attributes = array()) {
-    $this->update_attributes($attributes);
-  }
-
-  // Add/Update attributes on the file object.
-  function update_attributes($attributes = array()) {
-    foreach($attributes as $attr_name => $attr_value) {
-      if(!function_exists($this->$attr_name)) {
-        $this->$attr_name = $attr_value;
-      }
-    }
-  }
-}
-
-// General API request class
-class ZencoderRequest {
-
-  var $successful = false;
-  var $errors = array();
-  var $raw_results;
-  var $results;
-
-  function ZencoderRequest($url, $api_key = "", $params = "") {
-
-    // Add api_key to url if supplied
-    if($api_key) {
-      $url .= "?api_key=".$api_key;
-    }
-
-    // Get JSON
-    if(is_string($params)) {
-      $json = trim($params);
-    } else if(is_array($params)) {
-      $json = json_encode($params);
-    } else {
-      $json = false;
-    }
-
-    // Create request
-    $request = new ZencoderCURL($url, $json);
-
-    // Check for connection errors
-    if ($request->connected == false) {
-      $this->errors[] = $request->error;
-      return;
-    }
-
-    $status_code = intval($request->status_code);
-    $this->raw_results = $request->results;
-
-    // Parse returned JSON
-    $this->results = json_decode($this->raw_results, true);
-
-    // Return based on HTTP status code
-    if($status_code >= 200 && $status_code <= 206) {
-      $this->successful = true;
-    } else {
-      // Get job request errors if any
-      if(is_array($this->results["errors"])) {
-        foreach($this->results["errors"] as $error) {
-          $this->errors[] = $error;
-        }
-      } else {
-        $this->errors[] = "Unknown Error\n\nHTTP Status Code: ".$request->status_code."\n"."Raw Results: \n".$request->raw_results;
-      }
-    }
-  }
-}
-
-// ZencoderCURL
-// The connection class to perform the actual request to the surver
-// using cURL http://php.net/manual/en/book.curl.php
-class ZencoderCURL {
-
-  var $options = array(
-    CURLOPT_RETURNTRANSFER => 1, // Return content of the url
-    CURLOPT_HEADER => 0, // Don't return the header in result
-    CURLOPT_HTTPHEADER => array("Content-Type: application/json", "Accept: application/json"),
-    CURLOPT_CONNECTTIMEOUT => 0, // Time in seconds to timeout send request. 0 is no timeout.
-    CURLOPT_FOLLOWLOCATION => 1, // Follow redirects.
-  );
-
-  var $connected;
-  var $results;
-  var $status_code;
-  var $error;
-
-  // Initialize
-  function ZencoderCURL($url, $json, $options = array()) {
-
-    // Add library details to request
-    $this->options[CURLOPT_HTTPHEADER][] = "Zencoder-Library-Name: ".ZENCODER_LIBRARY_NAME;
-    $this->options[CURLOPT_HTTPHEADER][] = "Zencoder-Library-Version: ".ZENCODER_LIBRARY_VERSION;
-
-    // If posting data
-    if($json) {
-      $this->options[CURLOPT_POST] = 1;
-      $this->options[CURLOPT_POSTFIELDS] = $json;
-    }
-
-    // Add cURL options to defaults (can't use array_merge)
-    foreach($options as $option_key => $option) {
-      $this->options[$option_key] = $option;
-    }
-
-    // Initialize session
-    $ch = curl_init($url);
-
-    // Set transfer options
-    curl_setopt_array($ch, $this->options);
-
-    // Execute session and store returned results
-    $this->results = curl_exec($ch);
-
-    // Store the HTTP status code given (201, 404, etc.)
-    $this->status_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-
-    // Check for cURL error
-    if (curl_errno($ch)) {
-      $this->error = 'cURL connection error ('.curl_errno($ch).'): '.htmlspecialchars(curl_error($ch)).' <a href="http://www.google.com/search?q='.urlencode("curl error ".curl_error($ch)).'">Search</a>';
-      $this->connected = false;
-    } else {
-      $this->connected = true;
-    }
-
-    // Close session
-    curl_close($ch);
-  }
-}
-
-// Capture incoming notifications from Zencoder to your app
-class ZencoderOutputNotification {
-
-  var $output;
-  var $job;
-
-  function ZencoderOutputNotification($params) {
-    if($params["output"]) $this->output = new ZencoderOutputFile($params["output"]);
-    if($params["job"]) $this->job = new ZencoderJob($params["job"], array("build" => true));
-  }
-
-  function catch_and_parse() {
-    $notificiation_data = json_decode(trim(file_get_contents('php://input')), true);
-    return new ZencoderOutputNotification($notificiation_data);
-  }
-}
diff --git a/plugins/video_zencoder/includes/lib/JSON.php b/plugins/video_zencoder/includes/lib/JSON.php
deleted file mode 100644
index 229799b..0000000
--- a/plugins/video_zencoder/includes/lib/JSON.php
+++ /dev/null
@@ -1,806 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Converts to and from JSON format.
- *
- * JSON (JavaScript Object Notation) is a lightweight data-interchange
- * format. It is easy for humans to read and write. It is easy for machines
- * to parse and generate. It is based on a subset of the JavaScript
- * Programming Language, Standard ECMA-262 3rd Edition - December 1999.
- * This feature can also be found in  Python. JSON is a text format that is
- * completely language independent but uses conventions that are familiar
- * to programmers of the C-family of languages, including C, C++, C#, Java,
- * JavaScript, Perl, TCL, and many others. These properties make JSON an
- * ideal data-interchange language.
- *
- * This package provides a simple encoder and decoder for JSON notation. It
- * is intended for use with client-side Javascript applications that make
- * use of HTTPRequest to perform server communication functions - data can
- * be encoded into JSON notation for use in a client-side javascript, or
- * decoded from incoming Javascript requests. JSON format is native to
- * Javascript, and can be directly eval()'ed with no further parsing
- * overhead
- *
- * All strings should be in ASCII or UTF-8 format!
- *
- * LICENSE: Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met: Redistributions of source code must retain the
- * above copyright notice, this list of conditions and the following
- * disclaimer. Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- * NO EVENT SHALL CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
- * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * @category
- * @package     Services_JSON
- * @author      Michal Migurski <mike-json@teczno.com>
- * @author      Matt Knapp <mdknapp[at]gmail[dot]com>
- * @author      Brett Stimmerman <brettstimmerman[at]gmail[dot]com>
- * @copyright   2005 Michal Migurski
- * @version     CVS: $Id$
- * @license     http://www.opensource.org/licenses/bsd-license.php
- * @link        http://pear.php.net/pepr/pepr-proposal-show.php?id=198
- */
-
-/**
- * Marker constant for Services_JSON::decode(), used to flag stack state
- */
-define('SERVICES_JSON_SLICE',   1);
-
-/**
- * Marker constant for Services_JSON::decode(), used to flag stack state
- */
-define('SERVICES_JSON_IN_STR',  2);
-
-/**
- * Marker constant for Services_JSON::decode(), used to flag stack state
- */
-define('SERVICES_JSON_IN_ARR',  3);
-
-/**
- * Marker constant for Services_JSON::decode(), used to flag stack state
- */
-define('SERVICES_JSON_IN_OBJ',  4);
-
-/**
- * Marker constant for Services_JSON::decode(), used to flag stack state
- */
-define('SERVICES_JSON_IN_CMT', 5);
-
-/**
- * Behavior switch for Services_JSON::decode()
- */
-define('SERVICES_JSON_LOOSE_TYPE', 16);
-
-/**
- * Behavior switch for Services_JSON::decode()
- */
-define('SERVICES_JSON_SUPPRESS_ERRORS', 32);
-
-/**
- * Converts to and from JSON format.
- *
- * Brief example of use:
- *
- * <code>
- * // create a new instance of Services_JSON
- * $json = new Services_JSON();
- *
- * // convert a complexe value to JSON notation, and send it to the browser
- * $value = array('foo', 'bar', array(1, 2, 'baz'), array(3, array(4)));
- * $output = $json->encode($value);
- *
- * print($output);
- * // prints: ["foo","bar",[1,2,"baz"],[3,[4]]]
- *
- * // accept incoming POST data, assumed to be in JSON notation
- * $input = file_get_contents('php://input', 1000000);
- * $value = $json->decode($input);
- * </code>
- */
-class Services_JSON
-{
-   /**
-    * constructs a new JSON instance
-    *
-    * @param    int     $use    object behavior flags; combine with boolean-OR
-    *
-    *                           possible values:
-    *                           - SERVICES_JSON_LOOSE_TYPE:  loose typing.
-    *                                   "{...}" syntax creates associative arrays
-    *                                   instead of objects in decode().
-    *                           - SERVICES_JSON_SUPPRESS_ERRORS:  error suppression.
-    *                                   Values which can't be encoded (e.g. resources)
-    *                                   appear as NULL instead of throwing errors.
-    *                                   By default, a deeply-nested resource will
-    *                                   bubble up with an error, so all return values
-    *                                   from encode() should be checked with isError()
-    */
-    function Services_JSON($use = 0)
-    {
-        $this->use = $use;
-    }
-
-   /**
-    * convert a string from one UTF-16 char to one UTF-8 char
-    *
-    * Normally should be handled by mb_convert_encoding, but
-    * provides a slower PHP-only method for installations
-    * that lack the multibye string extension.
-    *
-    * @param    string  $utf16  UTF-16 character
-    * @return   string  UTF-8 character
-    * @access   private
-    */
-    function utf162utf8($utf16)
-    {
-        // oh please oh please oh please oh please oh please
-        if(function_exists('mb_convert_encoding')) {
-            return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
-        }
-
-        $bytes = (ord($utf16{0}) << 8) | ord($utf16{1});
-
-        switch(true) {
-            case ((0x7F & $bytes) == $bytes):
-                // this case should never be reached, because we are in ASCII range
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0x7F & $bytes);
-
-            case (0x07FF & $bytes) == $bytes:
-                // return a 2-byte UTF-8 character
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0xC0 | (($bytes >> 6) & 0x1F))
-                     . chr(0x80 | ($bytes & 0x3F));
-
-            case (0xFFFF & $bytes) == $bytes:
-                // return a 3-byte UTF-8 character
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0xE0 | (($bytes >> 12) & 0x0F))
-                     . chr(0x80 | (($bytes >> 6) & 0x3F))
-                     . chr(0x80 | ($bytes & 0x3F));
-        }
-
-        // ignoring UTF-32 for now, sorry
-        return '';
-    }
-
-   /**
-    * convert a string from one UTF-8 char to one UTF-16 char
-    *
-    * Normally should be handled by mb_convert_encoding, but
-    * provides a slower PHP-only method for installations
-    * that lack the multibye string extension.
-    *
-    * @param    string  $utf8   UTF-8 character
-    * @return   string  UTF-16 character
-    * @access   private
-    */
-    function utf82utf16($utf8)
-    {
-        // oh please oh please oh please oh please oh please
-        if(function_exists('mb_convert_encoding')) {
-            return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
-        }
-
-        switch(strlen($utf8)) {
-            case 1:
-                // this case should never be reached, because we are in ASCII range
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return $utf8;
-
-            case 2:
-                // return a UTF-16 character from a 2-byte UTF-8 char
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0x07 & (ord($utf8{0}) >> 2))
-                     . chr((0xC0 & (ord($utf8{0}) << 6))
-                         | (0x3F & ord($utf8{1})));
-
-            case 3:
-                // return a UTF-16 character from a 3-byte UTF-8 char
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr((0xF0 & (ord($utf8{0}) << 4))
-                         | (0x0F & (ord($utf8{1}) >> 2)))
-                     . chr((0xC0 & (ord($utf8{1}) << 6))
-                         | (0x7F & ord($utf8{2})));
-        }
-
-        // ignoring UTF-32 for now, sorry
-        return '';
-    }
-
-   /**
-    * encodes an arbitrary variable into JSON format
-    *
-    * @param    mixed   $var    any number, boolean, string, array, or object to be encoded.
-    *                           see argument 1 to Services_JSON() above for array-parsing behavior.
-    *                           if var is a strng, note that encode() always expects it
-    *                           to be in ASCII or UTF-8 format!
-    *
-    * @return   mixed   JSON string representation of input var or an error if a problem occurs
-    * @access   public
-    */
-    function encode($var)
-    {
-        switch (gettype($var)) {
-            case 'boolean':
-                return $var ? 'true' : 'false';
-
-            case 'NULL':
-                return 'null';
-
-            case 'integer':
-                return (int) $var;
-
-            case 'double':
-            case 'float':
-                return (float) $var;
-
-            case 'string':
-                // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
-                $ascii = '';
-                $strlen_var = strlen($var);
-
-               /*
-                * Iterate over every character in the string,
-                * escaping with a slash or encoding to UTF-8 where necessary
-                */
-                for ($c = 0; $c < $strlen_var; ++$c) {
-
-                    $ord_var_c = ord($var{$c});
-
-                    switch (true) {
-                        case $ord_var_c == 0x08:
-                            $ascii .= '\b';
-                            break;
-                        case $ord_var_c == 0x09:
-                            $ascii .= '\t';
-                            break;
-                        case $ord_var_c == 0x0A:
-                            $ascii .= '\n';
-                            break;
-                        case $ord_var_c == 0x0C:
-                            $ascii .= '\f';
-                            break;
-                        case $ord_var_c == 0x0D:
-                            $ascii .= '\r';
-                            break;
-
-                        case $ord_var_c == 0x22:
-                        case $ord_var_c == 0x2F:
-                        case $ord_var_c == 0x5C:
-                            // double quote, slash, slosh
-                            $ascii .= '\\'.$var{$c};
-                            break;
-
-                        case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
-                            // characters U-00000000 - U-0000007F (same as ASCII)
-                            $ascii .= $var{$c};
-                            break;
-
-                        case (($ord_var_c & 0xE0) == 0xC0):
-                            // characters U-00000080 - U-000007FF, mask 110XXXXX
-                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char = pack('C*', $ord_var_c, ord($var{$c + 1}));
-                            $c += 1;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-
-                        case (($ord_var_c & 0xF0) == 0xE0):
-                            // characters U-00000800 - U-0000FFFF, mask 1110XXXX
-                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char = pack('C*', $ord_var_c,
-                                         ord($var{$c + 1}),
-                                         ord($var{$c + 2}));
-                            $c += 2;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-
-                        case (($ord_var_c & 0xF8) == 0xF0):
-                            // characters U-00010000 - U-001FFFFF, mask 11110XXX
-                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char = pack('C*', $ord_var_c,
-                                         ord($var{$c + 1}),
-                                         ord($var{$c + 2}),
-                                         ord($var{$c + 3}));
-                            $c += 3;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-
-                        case (($ord_var_c & 0xFC) == 0xF8):
-                            // characters U-00200000 - U-03FFFFFF, mask 111110XX
-                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char = pack('C*', $ord_var_c,
-                                         ord($var{$c + 1}),
-                                         ord($var{$c + 2}),
-                                         ord($var{$c + 3}),
-                                         ord($var{$c + 4}));
-                            $c += 4;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-
-                        case (($ord_var_c & 0xFE) == 0xFC):
-                            // characters U-04000000 - U-7FFFFFFF, mask 1111110X
-                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char = pack('C*', $ord_var_c,
-                                         ord($var{$c + 1}),
-                                         ord($var{$c + 2}),
-                                         ord($var{$c + 3}),
-                                         ord($var{$c + 4}),
-                                         ord($var{$c + 5}));
-                            $c += 5;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-                    }
-                }
-
-                return '"'.$ascii.'"';
-
-            case 'array':
-               /*
-                * As per JSON spec if any array key is not an integer
-                * we must treat the the whole array as an object. We
-                * also try to catch a sparsely populated associative
-                * array with numeric keys here because some JS engines
-                * will create an array with empty indexes up to
-                * max_index which can cause memory issues and because
-                * the keys, which may be relevant, will be remapped
-                * otherwise.
-                *
-                * As per the ECMA and JSON specification an object may
-                * have any string as a property. Unfortunately due to
-                * a hole in the ECMA specification if the key is a
-                * ECMA reserved word or starts with a digit the
-                * parameter is only accessible using ECMAScript's
-                * bracket notation.
-                */
-
-                // treat as a JSON object
-                if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) {
-                    $properties = array_map(array($this, 'name_value'),
-                                            array_keys($var),
-                                            array_values($var));
-
-                    foreach($properties as $property) {
-                        if(Services_JSON::isError($property)) {
-                            return $property;
-                        }
-                    }
-
-                    return '{' . join(',', $properties) . '}';
-                }
-
-                // treat it like a regular array
-                $elements = array_map(array($this, 'encode'), $var);
-
-                foreach($elements as $element) {
-                    if(Services_JSON::isError($element)) {
-                        return $element;
-                    }
-                }
-
-                return '[' . join(',', $elements) . ']';
-
-            case 'object':
-                $vars = get_object_vars($var);
-
-                $properties = array_map(array($this, 'name_value'),
-                                        array_keys($vars),
-                                        array_values($vars));
-
-                foreach($properties as $property) {
-                    if(Services_JSON::isError($property)) {
-                        return $property;
-                    }
-                }
-
-                return '{' . join(',', $properties) . '}';
-
-            default:
-                return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS)
-                    ? 'null'
-                    : new Services_JSON_Error(gettype($var)." can not be encoded as JSON string");
-        }
-    }
-
-   /**
-    * array-walking function for use in generating JSON-formatted name-value pairs
-    *
-    * @param    string  $name   name of key to use
-    * @param    mixed   $value  reference to an array element to be encoded
-    *
-    * @return   string  JSON-formatted name-value pair, like '"name":value'
-    * @access   private
-    */
-    function name_value($name, $value)
-    {
-        $encoded_value = $this->encode($value);
-
-        if(Services_JSON::isError($encoded_value)) {
-            return $encoded_value;
-        }
-
-        return $this->encode(strval($name)) . ':' . $encoded_value;
-    }
-
-   /**
-    * reduce a string by removing leading and trailing comments and whitespace
-    *
-    * @param    $str    string      string value to strip of comments and whitespace
-    *
-    * @return   string  string value stripped of comments and whitespace
-    * @access   private
-    */
-    function reduce_string($str)
-    {
-        $str = preg_replace(array(
-
-                // eliminate single line comments in '// ...' form
-                '#^\s*//(.+)$#m',
-
-                // eliminate multi-line comments in '/* ... */' form, at start of string
-                '#^\s*/\*(.+)\*/#Us',
-
-                // eliminate multi-line comments in '/* ... */' form, at end of string
-                '#/\*(.+)\*/\s*$#Us'
-
-            ), '', $str);
-
-        // eliminate extraneous space
-        return trim($str);
-    }
-
-   /**
-    * decodes a JSON string into appropriate variable
-    *
-    * @param    string  $str    JSON-formatted string
-    *
-    * @return   mixed   number, boolean, string, array, or object
-    *                   corresponding to given JSON input string.
-    *                   See argument 1 to Services_JSON() above for object-output behavior.
-    *                   Note that decode() always returns strings
-    *                   in ASCII or UTF-8 format!
-    * @access   public
-    */
-    function decode($str)
-    {
-        $str = $this->reduce_string($str);
-
-        switch (strtolower($str)) {
-            case 'true':
-                return true;
-
-            case 'false':
-                return false;
-
-            case 'null':
-                return null;
-
-            default:
-                $m = array();
-
-                if (is_numeric($str)) {
-                    // Lookie-loo, it's a number
-
-                    // This would work on its own, but I'm trying to be
-                    // good about returning integers where appropriate:
-                    // return (float)$str;
-
-                    // Return float or int, as appropriate
-                    return ((float)$str == (integer)$str)
-                        ? (integer)$str
-                        : (float)$str;
-
-                } elseif (preg_match('/^("|\').*(\1)$/s', $str, $m) && $m[1] == $m[2]) {
-                    // STRINGS RETURNED IN UTF-8 FORMAT
-                    $delim = substr($str, 0, 1);
-                    $chrs = substr($str, 1, -1);
-                    $utf8 = '';
-                    $strlen_chrs = strlen($chrs);
-
-                    for ($c = 0; $c < $strlen_chrs; ++$c) {
-
-                        $substr_chrs_c_2 = substr($chrs, $c, 2);
-                        $ord_chrs_c = ord($chrs{$c});
-
-                        switch (true) {
-                            case $substr_chrs_c_2 == '\b':
-                                $utf8 .= chr(0x08);
-                                ++$c;
-                                break;
-                            case $substr_chrs_c_2 == '\t':
-                                $utf8 .= chr(0x09);
-                                ++$c;
-                                break;
-                            case $substr_chrs_c_2 == '\n':
-                                $utf8 .= chr(0x0A);
-                                ++$c;
-                                break;
-                            case $substr_chrs_c_2 == '\f':
-                                $utf8 .= chr(0x0C);
-                                ++$c;
-                                break;
-                            case $substr_chrs_c_2 == '\r':
-                                $utf8 .= chr(0x0D);
-                                ++$c;
-                                break;
-
-                            case $substr_chrs_c_2 == '\\"':
-                            case $substr_chrs_c_2 == '\\\'':
-                            case $substr_chrs_c_2 == '\\\\':
-                            case $substr_chrs_c_2 == '\\/':
-                                if (($delim == '"' && $substr_chrs_c_2 != '\\\'') ||
-                                   ($delim == "'" && $substr_chrs_c_2 != '\\"')) {
-                                    $utf8 .= $chrs{++$c};
-                                }
-                                break;
-
-                            case preg_match('/\\\u[0-9A-F]{4}/i', substr($chrs, $c, 6)):
-                                // single, escaped unicode character
-                                $utf16 = chr(hexdec(substr($chrs, ($c + 2), 2)))
-                                       . chr(hexdec(substr($chrs, ($c + 4), 2)));
-                                $utf8 .= $this->utf162utf8($utf16);
-                                $c += 5;
-                                break;
-
-                            case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F):
-                                $utf8 .= $chrs{$c};
-                                break;
-
-                            case ($ord_chrs_c & 0xE0) == 0xC0:
-                                // characters U-00000080 - U-000007FF, mask 110XXXXX
-                                //see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= substr($chrs, $c, 2);
-                                ++$c;
-                                break;
-
-                            case ($ord_chrs_c & 0xF0) == 0xE0:
-                                // characters U-00000800 - U-0000FFFF, mask 1110XXXX
-                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= substr($chrs, $c, 3);
-                                $c += 2;
-                                break;
-
-                            case ($ord_chrs_c & 0xF8) == 0xF0:
-                                // characters U-00010000 - U-001FFFFF, mask 11110XXX
-                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= substr($chrs, $c, 4);
-                                $c += 3;
-                                break;
-
-                            case ($ord_chrs_c & 0xFC) == 0xF8:
-                                // characters U-00200000 - U-03FFFFFF, mask 111110XX
-                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= substr($chrs, $c, 5);
-                                $c += 4;
-                                break;
-
-                            case ($ord_chrs_c & 0xFE) == 0xFC:
-                                // characters U-04000000 - U-7FFFFFFF, mask 1111110X
-                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= substr($chrs, $c, 6);
-                                $c += 5;
-                                break;
-
-                        }
-
-                    }
-
-                    return $utf8;
-
-                } elseif (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) {
-                    // array, or object notation
-
-                    if ($str{0} == '[') {
-                        $stk = array(SERVICES_JSON_IN_ARR);
-                        $arr = array();
-                    } else {
-                        if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
-                            $stk = array(SERVICES_JSON_IN_OBJ);
-                            $obj = array();
-                        } else {
-                            $stk = array(SERVICES_JSON_IN_OBJ);
-                            $obj = new stdClass();
-                        }
-                    }
-
-                    array_push($stk, array('what'  => SERVICES_JSON_SLICE,
-                                           'where' => 0,
-                                           'delim' => false));
-
-                    $chrs = substr($str, 1, -1);
-                    $chrs = $this->reduce_string($chrs);
-
-                    if ($chrs == '') {
-                        if (reset($stk) == SERVICES_JSON_IN_ARR) {
-                            return $arr;
-
-                        } else {
-                            return $obj;
-
-                        }
-                    }
-
-                    //print("\nparsing {$chrs}\n");
-
-                    $strlen_chrs = strlen($chrs);
-
-                    for ($c = 0; $c <= $strlen_chrs; ++$c) {
-
-                        $top = end($stk);
-                        $substr_chrs_c_2 = substr($chrs, $c, 2);
-
-                        if (($c == $strlen_chrs) || (($chrs{$c} == ',') && ($top['what'] == SERVICES_JSON_SLICE))) {
-                            // found a comma that is not inside a string, array, etc.,
-                            // OR we've reached the end of the character list
-                            $slice = substr($chrs, $top['where'], ($c - $top['where']));
-                            array_push($stk, array('what' => SERVICES_JSON_SLICE, 'where' => ($c + 1), 'delim' => false));
-                            //print("Found split at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-
-                            if (reset($stk) == SERVICES_JSON_IN_ARR) {
-                                // we are in an array, so just push an element onto the stack
-                                array_push($arr, $this->decode($slice));
-
-                            } elseif (reset($stk) == SERVICES_JSON_IN_OBJ) {
-                                // we are in an object, so figure
-                                // out the property name and set an
-                                // element in an associative array,
-                                // for now
-                                $parts = array();
-                                
-                                if (preg_match('/^\s*(["\'].*[^\\\]["\'])\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
-                                    // "name":value pair
-                                    $key = $this->decode($parts[1]);
-                                    $val = $this->decode($parts[2]);
-
-                                    if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
-                                        $obj[$key] = $val;
-                                    } else {
-                                        $obj->$key = $val;
-                                    }
-                                } elseif (preg_match('/^\s*(\w+)\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
-                                    // name:value pair, where name is unquoted
-                                    $key = $parts[1];
-                                    $val = $this->decode($parts[2]);
-
-                                    if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
-                                        $obj[$key] = $val;
-                                    } else {
-                                        $obj->$key = $val;
-                                    }
-                                }
-
-                            }
-
-                        } elseif ((($chrs{$c} == '"') || ($chrs{$c} == "'")) && ($top['what'] != SERVICES_JSON_IN_STR)) {
-                            // found a quote, and we are not inside a string
-                            array_push($stk, array('what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs{$c}));
-                            //print("Found start of string at {$c}\n");
-
-                        } elseif (($chrs{$c} == $top['delim']) &&
-                                 ($top['what'] == SERVICES_JSON_IN_STR) &&
-                                 ((strlen(substr($chrs, 0, $c)) - strlen(rtrim(substr($chrs, 0, $c), '\\'))) % 2 != 1)) {
-                            // found a quote, we're in a string, and it's not escaped
-                            // we know that it's not escaped becase there is _not_ an
-                            // odd number of backslashes at the end of the string so far
-                            array_pop($stk);
-                            //print("Found end of string at {$c}: ".substr($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n");
-
-                        } elseif (($chrs{$c} == '[') &&
-                                 in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
-                            // found a left-bracket, and we are in an array, object, or slice
-                            array_push($stk, array('what' => SERVICES_JSON_IN_ARR, 'where' => $c, 'delim' => false));
-                            //print("Found start of array at {$c}\n");
-
-                        } elseif (($chrs{$c} == ']') && ($top['what'] == SERVICES_JSON_IN_ARR)) {
-                            // found a right-bracket, and we're in an array
-                            array_pop($stk);
-                            //print("Found end of array at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-
-                        } elseif (($chrs{$c} == '{') &&
-                                 in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
-                            // found a left-brace, and we are in an array, object, or slice
-                            array_push($stk, array('what' => SERVICES_JSON_IN_OBJ, 'where' => $c, 'delim' => false));
-                            //print("Found start of object at {$c}\n");
-
-                        } elseif (($chrs{$c} == '}') && ($top['what'] == SERVICES_JSON_IN_OBJ)) {
-                            // found a right-brace, and we're in an object
-                            array_pop($stk);
-                            //print("Found end of object at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-
-                        } elseif (($substr_chrs_c_2 == '/*') &&
-                                 in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
-                            // found a comment start, and we are in an array, object, or slice
-                            array_push($stk, array('what' => SERVICES_JSON_IN_CMT, 'where' => $c, 'delim' => false));
-                            $c++;
-                            //print("Found start of comment at {$c}\n");
-
-                        } elseif (($substr_chrs_c_2 == '*/') && ($top['what'] == SERVICES_JSON_IN_CMT)) {
-                            // found a comment end, and we're in one now
-                            array_pop($stk);
-                            $c++;
-
-                            for ($i = $top['where']; $i <= $c; ++$i)
-                                $chrs = substr_replace($chrs, ' ', $i, 1);
-
-                            //print("Found end of comment at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-
-                        }
-
-                    }
-
-                    if (reset($stk) == SERVICES_JSON_IN_ARR) {
-                        return $arr;
-
-                    } elseif (reset($stk) == SERVICES_JSON_IN_OBJ) {
-                        return $obj;
-
-                    }
-
-                }
-        }
-    }
-
-    /**
-     * @todo Ultimately, this should just call PEAR::isError()
-     */
-    function isError($data, $code = null)
-    {
-        if (class_exists('pear')) {
-            return PEAR::isError($data, $code);
-        } elseif (is_object($data) && (get_class($data) == 'services_json_error' ||
-                                 is_subclass_of($data, 'services_json_error'))) {
-            return true;
-        }
-
-        return false;
-    }
-}
-
-if (class_exists('PEAR_Error')) {
-
-    class Services_JSON_Error extends PEAR_Error
-    {
-        function Services_JSON_Error($message = 'unknown error', $code = null,
-                                     $mode = null, $options = null, $userinfo = null)
-        {
-            parent::PEAR_Error($message, $code, $mode, $options, $userinfo);
-        }
-    }
-
-} else {
-
-    /**
-     * @todo Ultimately, this class shall be descended from PEAR_Error
-     */
-    class Services_JSON_Error
-    {
-        function Services_JSON_Error($message = 'unknown error', $code = null,
-                                     $mode = null, $options = null, $userinfo = null)
-        {
-
-        }
-    }
-
-}
-    
-?>
\ No newline at end of file
diff --git a/plugins/video_zencoder/includes/zencoder.inc b/plugins/video_zencoder/includes/zencoder.inc
deleted file mode 100644
index fcf7e48..0000000
--- a/plugins/video_zencoder/includes/zencoder.inc
+++ /dev/null
@@ -1,280 +0,0 @@
-<?php
-//$Id$
-/*
- * @file
- * Class file to handle amazon s3 transfers.
- *
-*/
-
-// Include our class file.
-require_once('Zencoder.php');
-
-define('VIDEO_ZC_PENDING', 0);
-define('VIDEO_ZC_WORKING', 1);
-define('VIDEO_ZC_ACTIVE', 2);
-define('VIDEO_ZC_FAILED', 3);
-
-class video_zencoder_api {
-
-  private $jobid;
-  private $access_key;
-  private $limit;
-  private $bucket;
-
-  public function __construct() {
-    $this->access_key = variable_get('zencoder_api_key', '');
-    $this->limit = variable_get('amazon_s3_limit',5);
-    $this->bucket = variable_get('amazon_s3_bucket', '');
-  }
-
-
-  /**
-   * create transcoding job on Zencoder.com
-   */
-  public function create($file) {
-    // API Key
-    $api_key = variable_get('zencoder_api_key', '');
-    // File details
-    $filename = $file->filename;
-    // Get varialbes
-    $lable = 'VIDEO_' . $file->fid;
-    $base_url = $folder;
-    $width = variable_get('zc_width', '');
-    $height = variable_get('zc_height', '');
-    $quality = variable_get('zc_quality', 3);
-    $speed = variable_get('zc_speed', 3);
-    $upscale = variable_get('zc_upscale', '');
-    $stretch = variable_get('zc_stretch', '');
-    $frame_rate = variable_get('zc_frame_rate', '');
-    $max_frame_rate = variable_get('zc_max_frame_rate', '');
-    $keyframe_interval = variable_get('zc_key_frame_interval', '');
-    $video_bitrate = variable_get('zc_vid_bit_rate', '');
-    $bitrate_cap = variable_get('zc_bit_rate_cap', '');
-    $buffer_size = variable_get('zc_buffer_size', '');
-    $h264_profile = variable_get('zc_h245_profile', 1);
-    $h264_level = variable_get('zc_h245_level', 0);
-    $skip_video = variable_get('zc_skip_video', '');
-    $audio_codec = variable_get('zc_audio_codec', 'aac');
-    $audio_bitrate = variable_get('zc_audio_bitrate', '');
-    $audio_channels = variable_get('zc_audio_channels', 2);
-    $audio_sample_rate = variable_get('zc_audio_sample_rate', '');
-    $skip_audio = variable_get('zc_skip_audio', '');
-    $thumb_no = variable_get('no_of_video_thumbs', 5);
-    // TODO :
-    $thumb_size = '160x120';
-    $thumb_base = $baseurl;
-    $thumb_prefix = $filename;
-    $notify_url = variable_get('zc_notify_url', '');
-    $notify_email = variable_get('zc_notify_email', 'heshanmw@gmail.com');
-    $start_clip = variable_get('zc_start_clip', '');
-    $clip_length = variable_get('zc_clip_length', '');
-
-    $bucket = $this->bucket;
-
-    // Job details
-    $input_name = $bucket . '/' . $filename;
-//    watchdog('zencoder', $input_name);
-
-    $zc_output = array();
-    if(!empty($lable))
-      $zc_output['label'] = $lable;
-    if(!empty($bucket))
-      $zc_output['url'] = 's3://' . $bucket . '/' . $filename . '.flv';
-    if(!empty($width))
-      $zc_output['width'] = $width;
-    if(!empty($height))
-      $zc_output['height'] = $height;
-    if($quality != 3)
-      $zc_output['quality'] = $quality;
-    if($speed != 3)
-      $zc_output['speed'] = $speed;
-    if(!empty($upscale))
-      $zc_output['upscale'] = $upscale;
-    if(!empty($frame_rate))
-      $zc_output['frame_rate'] = $frame_rate;
-    if(!empty($max_frame_rate))
-      $zc_output['max_frame_rate'] = $max_frame_rate;
-    if(!empty($keyframe_interval))
-      $zc_output['keyframe_interval'] = $keyframe_interval;
-    if(!empty($video_bitrate))
-      $zc_output['video_bitrate'] = $video_bitrate;
-    if(!empty($bitrate_cap))
-      $zc_output['bitrate_cap'] = $bitrate_cap;
-    if(!empty($buffer_size))
-      $zc_output['buffer_size'] = $buffer_size;
-    if(($h264_profile != 1))
-      $zc_output['h264_profile'] = $h264_profile;
-    if(($h264_level != 0))
-      $zc_output['h264_level'] = $h264_level;
-    if(!empty($skip_video))
-      $zc_output['skip_video'] = $skip_video;
-    if(($audio_codec != 'aac'))
-      $zc_output['audio_codec'] = $audio_codec;
-    if(!empty($audio_bitrate))
-      $zc_output['audio_bitrate'] = $audio_bitrate;
-    if(($audio_channels != 2))
-      $zc_output['audio_channels'] = $audio_channels;
-    if(!empty($audio_sample_rate))
-      $zc_output['audio_sample_rate'] = $audio_sample_rate;
-    if(!empty($skip_audio))
-      $zc_output['skip_audio'] = $skip_audio;
-    if(!empty($start_clip))
-      $zc_output['start_clip'] = $start_clip;
-    if(!empty($clip_length))
-      $zc_output['clip_length'] = $clip_length;
-
-// thumbnails
-    $thumbnails['number'] = $thumb_no;
-    if(!empty($thumb_size))
-      $thumbnails['thumb_size'] = $thumb_size;
-    if(!empty($bucket))
-      $thumbnails['base_url'] = 's3://' . $bucket;
-    if(!empty($lable))
-      $thumbnails['prefix'] = $lable;
-    $zc_output['thumbnails'] = $thumbnails;
-
-    // Notifications
-    if(!empty($notify_url))
-      $notifications[] = $notify_url;
-    if(!empty($notify_email))
-      $notifications[] = $notify_email;
-    $zc_output['notifications'] = $notifications;
-
-
-    $encoding_job_json = array(
-            'test' => 1,
-//            'download_connections' => -1,
-            'api_key' => $this->access_key,
-            'input' => 's3://' . $input_name . '',
-            'output' => $zc_output
-    );
-
-
-    watchdog('zencoder', json_encode($encoding_job_json));
-
-    $encoding_job = new ZencoderJob(json_encode($encoding_job_json));
-
-    // Check if it worked
-    if ($encoding_job->created) {
-//      watchdog('zencoder', $encoding_job->id);
-      return $encoding_job;
-    }
-    else {
-      foreach($encoding_job->errors as $error) {
-        //      echo $error."\n";
-        watchdog('zencoder', 'Zencoder reports some errors. !error', array('!error' => $error), WATCHDOG_ERROR);
-      }
-      return false;
-    }
-
-  }
-
-  /*
-   * Inserts file object into the database.
-  */
-  public function insert($fid, $jobid = 0) {
-    db_query("INSERT INTO {video_zencoder} (fid, jobid, status) VALUES (%d, %d, %d)", $fid, $jobid, VIDEO_ZC_PENDING);
-  }
-
-  /*
-   * Updates the database after a successful transfer to amazon.
-  */
-  public function update($video) {
-    $result = db_query("UPDATE {video_zencoder} SET jobid = %d, outputid = %d, bucket='%s', filename='%s', filepath='%s', filemime='%s', filesize='%s', status=%d, completed=%d WHERE vid=%d",
-            $video->jobid, $video->outputid, $video->bucket, $video->filename, $video->filepath, $video->filemime, $video->filesize, VIDEO_ZC_ACTIVE, REQUEST_TIME, $video->vid);
-    return $result;
-  }
-
-  public function working($vid) {
-    db_query("UPDATE {video_zencoder} SET status=%d WHERE vid=%d", VIDEO_ZC_WORKING, $vid);
-  }
-
-  public function failed($vid) {
-    db_query("UPDATE {video_zencoder} SET status=%d WHERE vid=%d", VIDEO_ZC_FAILED, $vid);
-  }
-  /*
-   * Verifies the existence of a file id, returns the row or false if none found.
-  */
-  public function verify($fid) {
-    $sql = db_query("SELECT * FROM {video_zencoder} WHERE fid=%d", $fid);
-    $row = db_fetch_object($sql);
-    return $row;
-  }
-
-  public function delete($fid) {
-    // Lets get our file no matter the status and delete it.
-    if($video = $this->verify($fid)) {
-      // Lets delete our record from the database.
-      db_query("DELETE FROM {video_zencoder} WHERE vid=%d", $video->vid);
-    }
-  }
-  public function get_job_id() {
-    return $this->jobid;
-  }
-  /*
-   * Gets a video object from the database.
-  */
-  public function get($fid) {
-    $sql = db_query("SELECT * FROM {video_zencoder} WHERE fid=%d AND status=%d", $fid, VIDEO_ZC_ACTIVE);
-    $row = db_fetch_object($sql);
-    return $row;
-  }
-
-  /*
-   * Selects the pending queue to be transfered to amazon.
-  */
-  public function queue() {
-    $video = false;
-    $sql = db_query("SELECT vid, fid FROM {video_zencoder} WHERE status=%d LIMIT %d", VIDEO_ZC_PENDING, $this->limit);
-    while($row = db_fetch_object($sql)) {
-      // We need to check if this file id exists in our S3 table to avoid filenot found error.
-      $sql_video = db_query("SELECT * FROM {video_s3} WHERE fid=%d", $row->fid);
-      if($sql_video_row = db_fetch_object($sql_video)) {
-        // This is a s3 file, lets verify it has been pushed and if so lets push Zencoder queue.
-        module_load_include('inc', 'video', '/includes/conversion');
-        if($sql_video_row->status == VIDEO_ZC_ACTIVE) {
-          $video = $sql_video_row;
-        }
-      }
-      else {
-        // This is a regular video file, lets get our file object from the files table and push it to amazon.
-        $sql_files = db_query("SELECT * FROM {files} WHERE fid=%d", $row->fid);
-        if($sql_files_row = db_fetch_object($sql_files)) {
-          $video = $sql_files_row;
-        }
-      }
-      // If we have a video lets go ahead and send it.
-      if($video) {
-        // Get Output file info
-        // API Key
-        $api_key = variable_get('zencoder_api_key', '');
-
-        // Update our status to working.
-        $this->working($row->vid);
-        $filepath = $video->filepath;
-        $filename = basename($video->filepath);
-        if ($encoding_job = $this->create($video)) {
-          // Update our table.
-          $video->bucket = $this->bucket;
-          $video->filename = $filename . '.flv';
-          $video->filemime = 'video/x-flv';
-          $video->vid = $row->vid;
-          $video->jobid = $encoding_job->id;
-          $video->outputid = $encoding_job->outputs["VIDEO" . $video->fid]->id;
-          $prefix = $this->ssl ? 'https://' : 'http://';
-          $video->filepath = $prefix . $video->bucket .'.s3.amazonaws.com/'. $filename . '.flv';
-          if($this->update($video)) {
-            watchdog('zencoder', t('Successfully created trancoding job on file: !file into the bucket %bucket on Zencoder.', array('!file' => $filepath, '%bucket' => $this->bucket)), array(), WATCHDOG_INFO);
-          }
-        }
-        else {
-          watchdog('zencoder', 'Failed to queus our file to Zencoder.', array(), WATCHDOG_ERROR);
-          $this->failed($row->vid);
-        }
-      }
-      else {
-        watchdog('zencoder', 'We did not find the file id: '.$row->fid.' or it is still queued for ffmpeg processing or S3 push.', array(), WATCHDOG_DEBUG);
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/plugins/video_zencoder/video_zencoder.admin.inc b/plugins/video_zencoder/video_zencoder.admin.inc
deleted file mode 100644
index 7dcfa7f..0000000
--- a/plugins/video_zencoder/video_zencoder.admin.inc
+++ /dev/null
@@ -1,302 +0,0 @@
-<?php
-// $Id$
-/**
- * @file
- * Provides admin functions for the s3 amazon webservices.
- */
-function video_zencoder_admin_settings() {
-  global $user;
-
-  $form = array();
-  $form['zencoder_info'] = array(
-          '#type' => 'fieldset',
-          '#title' => t('Zencoder API'),
-          '#collapsible' => FALSE,
-          '#collapsed' => FALSE,
-  );
-//  $form['amazon_info']['zencoder_username'] = array(
-//          '#type' => 'textfield',
-//          '#title' => t('Your email address'),
-//          '#default_value' => variable_get('zencoder_username', $user->mail),
-//          '#size' => 50,
-//          '#description' => t('Make sure the email is accurate, since we will send all the password details and API key details to this.')
-//  );
-//  $form['amazon_info']['agree_terms_zencoder'] = array(
-//          '#type' => 'checkbox',
-//          '#title' => t('Agree Zencoder Terms and Conditions.'),
-//          '#default_value' => variable_get('agree_terms_zencoder', TRUE),
-//          '#description' => t('Read terms and conditions on !link.', array('!link' => l(t('Zencoder.com'), 'http://zencoder.com'))),
-//  );
-  $form['zencoder_info']['zencoder_api_key'] = array(
-          '#type' => 'textfield',
-          '#title' => t('Zencoder API Key'),
-          '#default_value' => variable_get('zencoder_api_key', ''),
-          '#size' => 50,
-          '#description' => t('Zencoder API Key if you don\'t have API key click here to generate one.')
-  );
-
-  $form['zencoder'] = array(
-          '#type' => 'fieldset',
-          '#title' => t("Zencoder Settings"),
-          '#collapsed' => false,
-          '#description' => t('All output settings are optional. We choose sensible defaults for web and iPhone playback.')
-  );
-
-  // Basic Video Settings
-  $form['zencoder']['basic_video'] = array(
-          '#type' => 'fieldset',
-          '#title' => t("Basic Video Settings"),
-          '#collapsed' => true,
-          '#collapsible' => true,
-          '#description' => t('')
-  );
-
-  $form['zencoder']['basic_video']['zc_width'] = array(
-          '#type' => 'textfield',
-          '#title' => t('Video width'),
-          '#default_value' => variable_get('zc_width', ''),
-          '#description' => t('Width of the converted video, of the format 600x400. This is the maximum width of the output video specified as a positive integer. In order for video compression to work properly the width should be divisible by 4 (or even better 16).'),
-          '#size' => 12,
-  );
-  $form['zencoder']['basic_video']['zc_height'] = array(
-          '#type' => 'textfield',
-          '#title' => t('Video height'),
-          '#default_value' => variable_get('zc_height', ''),
-          '#description' => t('Width of the converted video, of the format 600x400. This is the maximum height of the output video specified as a positive integer. In order for video compression to work properly the height should be divisible by 4 (or even better 16).'),
-          '#size' => 12,
-  );
-  $quality = array(
-          1=>'1 - Poor Quality (Smaller file)',
-          2=>2,
-          3=>'3 - Default',
-          4=>4,
-          5=>'5 - High Quality (Larger file)'
-  );
-  $form['zencoder']['basic_video']['zc_quality'] = array(
-          '#type' => 'select',
-          '#title' => t('Quality'),
-          '#options' => $quality,
-          '#default_value' => variable_get('zc_quality', 3),
-          '#description' => t('This is the desired output video quality. A higher quality setting will mean higher bitrates and higher file sizes. A quality setting of 5 will be nearly lossless and a setting of 1 will be quite compressed and may not look great. Higher quality encoding is also a bit slower than lower quality encoding. As a rule of thumb, lowering quality by a level will reduce file size by about 40%. A quality setting of 3-4 usually looks pretty good. Note that the actual bitrate will vary when using the quality setting, depending on the type of video. Even at the same quality setting, low-complexity video (like a screencast) will generally result in lower bitrates than high-complexity video (like a movie).'),
-  );
-  $speed = array(
-          1=>'1 - Slow (Better Compression)',
-          2=>2,
-          3=>'3 - Default',
-          4=>4,
-          5=>'5 - Fast (Worst Compression)'
-  );
-  $form['zencoder']['basic_video']['zc_speed'] = array(
-          '#type' => 'select',
-          '#title' => t('Speed'),
-          '#options' => $speed,
-          '#default_value' => variable_get('zc_speed', 3),
-          '#description' => t('This is the desired speed of encoding. A lower speed setting will mean slower encode times, but lower file sizes and better quality video. A high speed setting will transcode quickly, but compression will be less efficient and result in larger files with lower quality output.'),
-  );
-
-  // Advaced Video Settings
-  $form['zencoder']['adv_video'] = array(
-          '#type' => 'fieldset',
-          '#title' => t("Advanced Video Settings"),
-          '#collapsed' => true,
-          '#collapsible' => true,
-          '#description' => t('')
-  );
-
-  $form['zencoder']['adv_video']['zc_upscale'] = array(
-          '#type' => 'checkbox',
-          '#title' => t('Upscale?'),
-          '#description' => t("If a video is received that is smaller than your maximum frame size (width and height settings), this setting will determine if we will increase the size of the input video to the supplied width and height. For example, if width is set to 640 and the input file is 320x240, the upscale option will force the output video to expand to 640x480. If false, the output video will match the input's original size."),
-          '#default_value' => variable_get('zc_upscale', ''),
-  );
-  $form['zencoder']['adv_video']['zc_stretch'] = array(
-          '#type' => 'checkbox',
-          '#title' => t('Stretch?'),
-          '#description' => t("If true, the aspect ratio of the original file may be distorted to fit the aspect ratio of the supplied width and height. By default, aspect ratio will always be preserved."),
-          '#default_value' => variable_get('zc_stretch', ''),
-  );
-  $form['zencoder']['adv_video']['zc_frame_rate'] = array(
-          '#type' => 'textfield',
-          '#title' => t('Frame Rate '),
-          '#default_value' => variable_get('zc_frame_rate', ''),
-          '#description' => t('The output frame rate to use specified as a decimal number (e.g. 15 or 24.98). Unless you need to target a specific frame rate, you might be better off using Maximum Frame Rate setting. By default, the original frame rate will be preserved.'),
-          '#size' => 12,
-  );
-  $form['zencoder']['adv_video']['zc_max_frame_rate'] = array(
-          '#type' => 'textfield',
-          '#title' => t('Maximum Frame Rate'),
-          '#default_value' => variable_get('zc_max_frame_rate', ''),
-          '#description' => t('The maximum frame rate to allow specified as a decimal number (e.g. 15 or 24.98). If the original frame rate is lower than this value, it will not be increased. Otherwise, it will be lowered to the max frame rate. By default, the original frame rate will be preserved.'),
-          '#size' => 12,
-  );
-  $form['zencoder']['adv_video']['zc_key_frame_interval'] = array(
-          '#type' => 'textfield',
-          '#title' => t('Keyframe Interval'),
-          '#default_value' => variable_get('zc_key_frame_interval', ''),
-          '#description' => t('By default, a keyframe will be created every 250 frames. Specifying a keyframe interval will allow you to create more or less keyframes in your video. Sometimes the number of keyframes can affect video scrubbing. A greater number of keyframes will increase the size of your output file. Keyframe interval should be specified as a positive integer. For example, a value of 100 will create a keyframe every 100 frames.'),
-          '#size' => 12,
-  );
-  $form['zencoder']['adv_video']['zc_vid_bit_rate'] = array(
-          '#type' => 'textfield',
-          '#title' => t('Video Bitrate'),
-          '#default_value' => variable_get('zc_vid_bit_rate', ''),
-          '#description' => t('The target video bitrate specified as kilobits per second (Kbps, e.g. 300 or 500). If you set quality, you don\'t need to set bitrate, unless you want to target a specific bitrate.'),
-          '#size' => 12,
-  );
-  $form['zencoder']['adv_video']['zc_bit_rate_cap'] = array(
-          '#type' => 'textfield',
-          '#title' => t('Bitrate Cap'),
-          '#default_value' => variable_get('zc_bit_rate_cap', ''),
-          '#description' => t('A bitrate cap specified as kilobits per second (Kbps, e.g. 300 or 500). Specifying a quality alone will vary the bitrate to match the content of the video potentially introducing high peak bitrates. This setting will prevent peaks in the video bitrate, resulting in a file that looks worse but plays more smoothly. We recommend only using this for streaming or for devices that require it.'),
-          '#size' => 12,
-  );
-  $form['zencoder']['adv_video']['zc_buffer_size'] = array(
-          '#type' => 'textfield',
-          '#title' => t('Buffer Size'),
-          '#default_value' => variable_get('zc_buffer_size', ''),
-          '#description' => t('The buffer size specified as kilobits per second (Kbps, e.g. 300 or 500). This is another setting useful for playback on specific devices. Check your streaming server or device settings for tips, or set this to the same as the bitrate cap.'),
-          '#size' => 12,
-  );
-  $profile = array(
-          'baseline' => 'Baseline - Default',
-          'main' => 'Main',
-          'high' => 'High - Best for web playback'
-  );
-  $form['zencoder']['adv_video']['zc_h245_profile'] = array(
-          '#type' => 'select',
-          '#title' => t('H.264 Profile'),
-          '#options' => $profile,
-          '#default_value' => variable_get('zc_h245_profile', 1),
-          '#description' => t('The H.264 standard defines various sets of capabilities, which are referred to as profiles, targeting specific classes of applications. The currently supported profiles are baseline, main, and high. The baseline profile will produce video that looks worse, but requires less CPU on playback and is required for playback on some devices (e.g. iPhone or iPod). The high profile will look best, but can be CPU intensive to playback. By default, the baseline profile will be used to maximize compatibility.'),
-  );
-  $level = array(
-          '' => '',
-          '1' => '1',
-          '1.1' => '1.1',
-          '1.2' => '1.2',
-          '1.3' => '1.3',
-          '2' => '2',
-          '2.1' => '2.1',
-          '2.2' => '2.2',
-          '3' => '3',
-          '3.1' => '3.1',
-          '3.2' => '3.2',
-          '4' => '4',
-          '4.1' => '4.1',
-          '4.2' => '4.2',
-          '5' => '5',
-          '5.1' => '5.1'
-  );
-  $form['zencoder']['adv_video']['zc_h245_level'] = array(
-          '#type' => 'select',
-          '#title' => t('H.264 Level'),
-          '#options' => $level,
-          '#default_value' => variable_get('zc_h245_level', 0),
-          '#description' => t('Similar to profiles, the H.264 standard defines various levels that will limit the size and complexity of the output file. We recommend leaving this blank unless your output device requires it. iPhone video can\'t exceed level 3, Blu-Ray is 4.1, and older iPods max out at 1.3. By default, level 3 will be used to ensure iPhone playback.'),
-  );
-  $form['zencoder']['adv_video']['zc_skip_video'] = array(
-          '#type' => 'checkbox',
-          '#title' => t('Skip Video'),
-          '#description' => t("The video track will be omitted from the output. You can still specify a video format, however, no video track will be present in the resulting file."),
-          '#default_value' => variable_get('zc_skip_video', ''),
-  );
-
-  // Advanced Audio Settings
-  $form['zencoder']['adv_audio'] = array(
-          '#type' => 'fieldset',
-          '#title' => t("Advanced Audio Settings"),
-          '#collapsed' => true,
-          '#collapsible' => true,
-          '#description' => t('')
-  );
-  $audio_codec = array(
-          'aac' => 'AAC - Default',
-          'mp3' => 'MP3'
-  );
-  $form['zencoder']['adv_audio']['zc_audio_codec'] = array(
-          '#type' => 'select',
-          '#title' => t('Audio Codec'),
-          '#options' => $audio_codec,
-          '#default_value' => variable_get('zc_audio_codec', 'aac'),
-          '#description' => t('The audio codec used in the video file can affect the ability to play the video on certain devices. The default codec used is AAC and should only be changed if the playback device you are targeting requires something different.'),
-  );
-  $form['zencoder']['adv_audio']['zc_audio_bitrate'] = array(
-          '#type' => 'textfield',
-          '#title' => t('Audio Bitrate'),
-          '#default_value' => variable_get('zc_audio_bitrate', ''),
-          '#description' => t('The overall audio bitrate specified as kilobits per second (Kbps, e.g. 96 or 160). This value can\'t exceed 160 Kbps per channel. 96-160 is usually a good range for stereo output.'),
-          '#size' => 12,
-  );
-  $audio_channel = array(
-          1 => 'Mono',
-          2 => 'Stereo - Default'
-  );
-  $form['zencoder']['adv_audio']['zc_audio_channels'] = array(
-          '#type' => 'select',
-          '#title' => t('Audio Channels'),
-          '#options' => $audio_channel,
-          '#default_value' => variable_get('zc_audio_channels', 2),
-          '#description' => t('By default we will choose the lesser of the number of audio channels in the input file or 2 (stereo).'),
-  );
-  $form['zencoder']['adv_audio']['zc_audio_sample_rate'] = array(
-          '#type' => 'textfield',
-          '#title' => t('Audio Sample Rate'),
-          '#default_value' => variable_get('zc_audio_sample_rate', ''),
-          '#description' => t('The sample rate of the audio file specified in hertz (e.g. 44100 or 22050). A sample rate of 44100 is the best option for web playback. 22050 and 48000 are also valid options. Warning: the wrong setting may cause encoding problems. By default, 44100 will be used.'),
-          '#size' => 12,
-  );
-  $form['zencoder']['adv_audio']['zc_skip_audio'] = array(
-          '#type' => 'checkbox',
-          '#title' => t('Skip Audio'),
-          '#description' => t("The audio track will be omitted from the output. You must specify a video format and no audio track will be present in the resulting file."),
-          '#default_value' => variable_get('zc_skip_audio', ''),
-  );
-
-  // Notification Settings
-  $form['zencoder']['notification'] = array(
-          '#type' => 'fieldset',
-          '#title' => t("Notification Settings"),
-          '#collapsed' => true,
-          '#collapsible' => true,
-          '#description' => t('')
-  );
-  $form['zencoder']['notification']['zc_notify_url'] = array(
-          '#type' => 'textfield',
-          '#title' => t('URL'),
-          '#default_value' => variable_get('zc_notify_url', ''),
-          '#description' => t('We will POST a JSON notification to the URL provided. We will consider the notification successful if we receive a 200 OK response.'),
-  );
-  $form['zencoder']['notification']['zc_notify_email'] = array(
-          '#type' => 'textfield',
-          '#title' => t('Email Address'),
-          '#default_value' => variable_get('zc_notify_email', ''),
-          '#description' => t('We will send a notification email to the URL provided. The notification will contain basic file status information.'),
-  );
-
-
-  // Other Settings
-  $form['zencoder']['other'] = array(
-          '#type' => 'fieldset',
-          '#title' => t("Other Settings"),
-          '#collapsed' => true,
-          '#collapsible' => true,
-          '#description' => t('')
-  );
-  $form['zencoder']['other']['zc_start_clip'] = array(
-          '#type' => 'textfield',
-          '#title' => t('Start Clip'),
-          '#default_value' => variable_get('zc_start_clip', ''),
-          '#description' => t('Creates a subclip from the input file, starting at either a timecode or a number of seconds. Format: 0:01:23.6 or 88.6 for 1 minute and 23.6 seconds.'),
-          '#size' => 12,
-  );
-  $form['zencoder']['other']['zc_clip_length'] = array(
-          '#type' => 'textfield',
-          '#title' => t('Clip Length'),
-          '#default_value' => variable_get('zc_clip_length', ''),
-          '#description' => t('Creates a subclip from the input file of the specified length using either a timecode or a number of seconds. Format: 0:00:45.3 or 45.3 for 45.3 seconds.'),
-          '#size' => 12,
-  );
-
-  return system_settings_form($form);
-}
-
diff --git a/plugins/video_zencoder/video_zencoder.info b/plugins/video_zencoder/video_zencoder.info
deleted file mode 100644
index 0d4c214..0000000
--- a/plugins/video_zencoder/video_zencoder.info
+++ /dev/null
@@ -1,10 +0,0 @@
-;$Id$
-name = Zencoder API on Video
-description = Zencoder is a webservice to transcode videos.
-package = "Video"
-dependencies[] = video
-dependencies[] = video_s3
-core = 7.x
-files[]=video_zencoder.modules
-files[]=video_zencoder.install
-files[]=video_zencoder.admin.inc
\ No newline at end of file
diff --git a/plugins/video_zencoder/video_zencoder.install b/plugins/video_zencoder/video_zencoder.install
deleted file mode 100644
index 31c54a1..0000000
--- a/plugins/video_zencoder/video_zencoder.install
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-// $Id$
-/**
- * @file
- * Provides installation functions for video_s3.module.
- */
-
-/**
- * Implementation of hook_schema().
- */
-function video_zencoder_schema() {
-  $schema['video_zencoder'] = array(
-    'description' => t('Store video s3 cdn and convert with zencoder webservice'),
-    'fields' => array(
-  	  'vid' => array(
-        'description' => t('Auto Increment id'),
-        'type' => 'serial',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-      ),
-      'fid' => array(
-        'description' => t('Original file id'),
-        'type' => 'int',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-        'default' => 0,
-      ),
-      'nid' => array(
-        'description' => t('Node id'),
-        'type' => 'int',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-        'default' => 0,
-      ),
-      'jobid' => array(
-        'description' => t('Job id'),
-        'type' => 'int',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-        'default' => 0,
-      ),
-      'outputid' => array(
-        'description' => t('Job Output id'),
-        'type' => 'int',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-        'default' => 0,
-      ),
-      'bucket' => array(
-        'type' => 'varchar',
-        'length' => '255',
-        'default' => '',
-        'description' => t('The bucket the video is stored in.'),
-      ),
-	  'filename' => array(
-        'type' => 'varchar',
-        'length' => '255',
-        'default' => '',
-        'description' => t('The filename of the video.'),
-      ),
-	  'filepath' => array(
-        'type' => 'varchar',
-        'length' => '255',
-        'default' => '',
-        'description' => t('The filepath of the video.'),
-      ),
-	  'filemime' => array(
-        'type' => 'varchar',
-        'length' => '255',
-        'default' => '',
-        'description' => t('The filemime of the video.'),
-      ),
-      'filesize' => array(
-        'description' => t('Filesize of the video.'),
-        'type' => 'int',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-        'default' => 0,
-      ),
-      'status' => array(
-        'description' => t('Status of the cdn transfer'),
-        'type' => 'int',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-        'default' => 0,
-      ),
-      'completed' => array(
-        'description' => t('Time of successful completion to amazon.'),
-        'type' => 'int',
-        'not null' => TRUE,
-        'default' => 0,
-      ),
-    ),
-    'indexes' => array(
-      'status' => array('status'),
-      'file' => array('fid'),
-    ),
-    'primary key' => array('vid'),
-  );
-  return $schema;
-}
-
-/**
- * Implementation of hook_install().
- */
-function video_zencoder_install() {
-  drupal_install_schema('video_zencoder');
-}
-
-/**
- * Implementation of hook_uninstall().
- */
-function video_zencoder_uninstall() {
-  drupal_uninstall_schema('video_zencoder');
-  // TODO : Delete our variables.
-}
\ No newline at end of file
diff --git a/plugins/video_zencoder/video_zencoder.module b/plugins/video_zencoder/video_zencoder.module
deleted file mode 100644
index 042b2c3..0000000
--- a/plugins/video_zencoder/video_zencoder.module
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-// $Id$
-/**
- * @file
- * Provides wrapper functions for the s3 amazon webservices.
- */
-
-/*
- * Implementation of hook_perm().
- */
-function video_zencoder_perm() {
-  return array('administer zencoder');
-}
-/*
- * Implmentation of hook_help().
- */
-function video_zencoder_help($path, $arg) {
-  switch($path) {
-    case 'admin/settings/video/amazon_s3':
-      $output = t('Use Amazon Simple Storage Service (Amazon S3) to store your video files.  This free\'s up bandwidth from your site, providing a faster experience for your users.  Simply enable this module and enter your authentication details and your done!');
-      return $output;
-  }
-}
-
-/*
- * Implementation of hook_menu().
- */
-function video_zencoder_menu() {
-  $items = array();
-  $items['admin/settings/video/zencoder'] = array(
-    'title' => 'Zencoder',
-    'description' => 'Configure your Zencoder API settings.',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('video_zencoder_admin_settings'),
-    'access arguments' => array('administer site configuration'),
-    'file' => 'video_zencoder.admin.inc',
-    'type' => MENU_LOCAL_TASK,
-    'weight' => 10,
-  );
-  return $items;
-}
-
-/*
- * Implementation of hook_cron().
- */
-function video_zencoder_cron() {
-  module_load_include('inc', 'video_zencoder', '/includes/zencoder');
-  $zc = new video_zencoder_api;
-//  $s3->connect();
-//  // Lets run our queue.
-  $zc->queue();
-}
-
-/**
- * Implementation of hook_file_delete().
- */
-function video_zencoder_file_delete($file) {
-  module_load_include('inc', 'video_zencoder', '/includes/zencoder');
-  $zc = new video_zencoder_api;
-  // Lets run delete.
-  $zc->delete($file->fid);
-}
-
-/*
- * Implementation of hook_form_alter().
- */
-function video_zencoder_form_alter(&$form, &$form_state, $form_id) {
-  if (isset($form['type']) && isset($form['#node']) && $form['type']['#value'] .'_node_form' == $form_id) {
-    $form['buttons']['submit']['#submit'][] = 'video_zencoder_node_update_submit';
-  }
-}
-
-/*
- * Submit hanlder to update our s3 table to include the node id.
- */
-function video_zencoder_node_update_submit($form, &$form_state) {
-  //lets update our video rending table to include the node id created
-  if (isset($form_state['nid']) && isset($form_state['values']['video_id']) && is_array($form_state['values']['video_id'])) {
-    foreach($form_state['values']['video_id'] as $fid) {
-      //lets update our table to include the nid
-      db_query("UPDATE {video_zencoder} SET nid=%d WHERE fid=%d", $form_state['nid'], $fid);
-    }
-  }
-}
-
-/**
- * Implementing hook_video_submit
- * @param <type> $element
- * @param <type> $form_state
- */
-function video_zencoder_video_submit(&$element, &$form_state) {
-  $file = $element['#value'];
-  //we need to check if this fid has already been added to the database AND that there is in fact a fid
-  if (is_array($file) && isset($file['fid']) && !empty($file['fid'])) {
-    module_load_include('inc', 'video_zencoder', '/includes/zencoder');
-    $zc = new video_zencoder_api;
-    // Lets verify that we haven't added this video already.  Multiple validation fails will cause this to be ran more than once
-    if(!$video = $zc->verify($file['fid'])) {
-      // Video has not been added to the queue yet so lets add it.
-      $zc->insert($file['fid'], $jobid);
-      drupal_set_message(t('Video submission queued for transfer to your Zencoder Transcoding server. Will be there shortly.'));
-    }
-  }
-}
\ No newline at end of file
diff --git a/plugins/zencoder.inc b/plugins/zencoder.inc
deleted file mode 100644
index 989222b..0000000
--- a/plugins/zencoder.inc
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php
-//$Id$
-
-/**
- * @file
- * Provide a api for video conversion and auto thumbnailing using ffmpeg.
- *
- * @author Heshan Wanigasooriya <heshan at heidisoft.com, heshanmw at gmail dot com>
- * TODO: add common settings from video module configurations and extend it from ffmpeg.inc
- * since we need to have executable path of ffmpeg to ffmpeg.inc we need to have it
- */
-
-/**
- * Define some constants
- */
-defined('VIDEO_RENDERING_PENDING')
-  or define('VIDEO_RENDERING_PENDING', 1);
-defined('VIDEO_RENDERING_ACTIVE')
-  or define('VIDEO_RENDERING_ACTIVE', 5);
-defined('VIDEO_RENDERING_COMPLETE')
-  or define('VIDEO_RENDERING_COMPLETE', 10);
-defined('VIDEO_RENDERING_FAILED')
-  or define('VIDEO_RENDERING_FAILED', 20);
-
-// nice value to append at the beginning of the command
-defined('VIDEO_RENDERING_NICE')
-  or define('VIDEO_RENDERING_NICE', 'nice -n 19');
-
-// curl related data
-defined('HTTP_CONNECT_TIMEOUT')
-    or define('HTTP_CONNECT_TIMEOUT', 600);
-defined('HTTP_LOW_SPEED_LIMIT')
-    or define('HTTP_LOW_SPEED_LIMIT', 256);
-defined('HTTP_LOW_SPEED_TIMEOUT')
-    or define('HTTP_LOW_SPEED_TIMEOUT', 600);
-
-
-// TODO : add cron API to video module
-function zencoder_cron() {
-  global $base_url;
-
-  if(variable_get('video_zencoder_helper_auto_cvr_cron', true)) {
-    exec("php video_scheduler.php $base_url > /dev/null &");
-  }
-}
-
-
-/**
- * Get some informations from the video file
- */
-function zencoder_get_video_info($vidfile) {
-  static $zencoder_info;
-  $fid = $vidfile['fid'];
-  //  $command_output = cache_get($fid);
-  //  if(empty($command_output)) {
-  // escape file name for safety
-  $file = escapeshellarg($vidfile['filepath']);
-  // create the full command to execute
-  $command = variable_get('video_transcoder_path', '/usr/bin/ffmpeg') . ' -i ' . $file;
-
-  //execute the command
-  ob_start();
-  passthru($command." 2>&1", $command_return);
-  $command_output = ob_get_contents();
-  ob_end_clean();
-
-  // cache the result for further calls
-  //  $zencoder_info[$vidfile['fid']] = $command_output;
-  //    cache_set($vidfile['fid'], $command_output);
-  //  }
-
-  return $command_output;
-}
-
-
-/**
- * Return the video resolution
- */
-function zencoder_auto_resolution(&$node) {
-
-  if(!variable_get('video_zencoder_helper_auto_resolution', false)) {
-
-  // call ffmpeg -i
-    $zencoder_output = zencoder_get_video_info($node);
-
-    // get resolution
-    $pattern = '/Video: .*, ([0-9]{2,4}x[0-9]{2,4})/';
-    preg_match_all($pattern, $zencoder_output, $matches, PREG_PATTERN_ORDER);
-    $resolution = $matches[1][0];
-
-    return explode("x", $resolution);
-  }
-  return null;
-}
-
-
-/**
- * Return the playtime seconds of a video
- */
-function zencoder_auto_playtime($file) {
-
-  if(!variable_get('video_zencoder_helper_auto_playtime', false)) {
-
-  // call ffmpeg -i
-    $zencoder_output = zencoder_get_video_info($file);
-
-    // get playtime
-    $pattern = '/Duration: ([0-9]{2}:[0-9]{2}:[0-9]{2}\.[0-9])/';
-    preg_match_all($pattern, $zencoder_output, $matches, PREG_PATTERN_ORDER);
-    $playtime = $matches[1][0];
-
-    // ffmpeg return lenght as 00:00:31.1 Let's get playtime from that
-    $hmsmm = explode(":", $playtime);
-
-    $tmp = explode(".", $hmsmm[2]);
-    $seconds = $tmp[0];
-
-    $hours = $hmsmm[0];
-    $minutes = $hmsmm[1];
-
-    return $seconds + ($hours * 3600) + ($minutes * 60);
-  }
-}
-
-/**
- * Generates a thumbnail from the video file
- * Implementing hook_auto_thumbnail on inc
- *
- * @param $vidfile
- *   object with element information
- *
- * @return
- *   a drupal file objects
- */
-function zencoder_auto_thumbnail($vidfile) {
-  global $user;
-  $uploaded_file = $vidfile;
-  $fid = $uploaded_file["fid"];
-
-  // are we debugging?
-  // escape the filename for safety
-  $videofile = escapeshellarg($uploaded_file['filepath']);
-  $thumb_path = variable_get('video_thumb_path', 'video_thumbs');
-  //files will save in files/video_thumbs/#fileId folder
-  $tmp = file_directory_path(). '/' . $thumb_path . '/' . $fid;
-  // Ensure the destination directory exists and is writable.
-  $directories = explode('/', $tmp);
-  //  array_pop($directories); // Remove the file itself.
-  // Get the file system directory.
-  $file_system = file_directory_path();
-  foreach ($directories as $directory) {
-    $full_path = isset($full_path) ? $full_path . '/' . $directory : $directory;
-    // Don't check directories outside the file system path.
-    if (strpos($full_path, $file_system) === 0) {
-      field_file_check_directory($full_path, FILE_CREATE_DIRECTORY);
-    }
-  }
-  $count = variable_get('no_of_video_thumbs', 5);
-  $duration = zencoder_auto_playtime($vidfile);
-  $files = NULL;
-  for($i = 1; $i <= $count; $i++) {
-  // get ffmpeg configurations
-    $seek = ($duration/$count) * $i;
-    $thumbfile = $tmp . "/video-thumb-for-$fid-$i.png";
-    //skip files already exists, this will save ffmpeg traffic
-    if (!is_file($thumbfile)) {
-      $tnail = variable_get('video_transcoder_path', '/usr/bin/ffmpeg');
-      $options = preg_replace(array('/%videofile/', '/%thumbfile/', '/%seek/'), array($videofile, $thumbfile, $seek), variable_get('video_zencoder_thumbnailer_options', '-i %videofile -an -y -f mjpeg -ss %seek -vframes 1 %thumbfile'));
-      //    $options = preg_replace(array('/%videofile/', '/%tmp/', '/%id/', '/%interval/'), array($videofile, $tmp, $i, ($duration/$count)), variable_get('video_image_thumbnailer_options', '-ss %id*%interval -i %videofile -vframes 1 %thumbfile'));
-      //  ffmpeg -ss $i*$interval -i intro.mov -vframes 1 -s 320x240 thumb_$i.jpg
-      //ffmpeg -i superstunt_8uiarzrh.mp4 -r 0.1 -ss 00:00:5 -f image2 img/images%02d.png
-      ////ffmpeg -i superstunt_8uiarzrh.mp4 -r 0.05 -ss 00:00:5 -f image2 img/images%1d.jpg
-      // executes the command
-      $command = "$tnail $options";
-      ob_start();
-      passthru($command." 2>&1", $tnail_return);
-      $tnail_output = ob_get_contents();
-      ob_end_clean();
-      if (!file_exists($thumbfile)) {
-        $error_param = array(
-            '%file' => $thumbfile,
-            '%cmd' => $command,
-            '%out' => $tnail_output,
-        );
-        $error_msg = t("error generating thumbnail for video: generated file %file does not exist.<br />Command Executed:<br />%cmd<br />Command Output:<br />%out", $error_param);
-        // let's log this
-        watchdog('video_ffmpeg',$error_msg, array(), WATCHDOG_ERROR);
-      }
-    }
-    // Begin building file object.
-    //TODO : use file_munge_filename()
-    $file = new stdClass();
-    $file->uid      = $user->uid;
-    $file->status   = FILE_STATUS_TEMPORARY;
-    $file->filename = trim("video-thumb-for-$fid-$i.png");
-    $file->filepath = $thumbfile;
-    $file->filemime = file_get_mimetype("video-thumb-for-$fid-$i.png");
-    $file->filesize = filesize($thumbfile);
-    $file->timestamp = REQUEST_TIME;
-    $files[] = $file;
-  }
-  return $files;
-}
-
-/**
- * Implementing hook_chcek_exepath() on inc
- * To check the the path is executable or not
- * @param <type> path to check
- * @return bool TRUE/FALSE
- */
-function zencoder_check_exe_path($path=NULL) {
-  if (!$path) {
-    $path = variable_get('video_transcoder_path', '/usr/bin/ffmpeg');
-  }
-  if (function_exists('is_executable')) {
-    $test = 'is_executable';
-  } else {
-    $test = 'file_exists';
-  }
-  return $test($path);
-}
-
-/**
- * Implementing hook_auto_convert();
- * @param <type> $job
- */
-function zencoder_auto_convert(&$job) {
-  $videofile = escapeshellarg($job->filepath); // escape file name for safety
-  $convfile = tempnam(file_directory_temp(), 'video-rendering');
-  $audiobitrate = variable_get('video_zencoder_helper_auto_cvr_audio_bitrate', 64);
-  $videobitrate = variable_get('video_zencoder_helper_auto_cvr_video_bitrate', 200);
-  $size = _video_render_get_size();
-  $converter = variable_get('video_transcoder_path', '/usr/bin/ffmpeg');
-
-  $options = preg_replace(array('/%videofile/', '/%convertfile/', '/%audiobitrate/', '/%size/', '/%videobitrate/'),
-      array($videofile, $convfile, $audiobitrate, $size, $videobitrate),
-      variable_get('video_zencoder_helper_auto_cvr_options',
-      '-y -i %videofile -f flv -ar 22050 -ab %audiobitrate -s %size -b %videobitrate -qscale 1 %convertfile'));
-
-  // set to the converted file output
-  $job->convfile = $convfile;
-
-  $command = VIDEO_RENDERING_NICE . " $converter $options";
-
-  //print('executing ' . $command); die;
-  watchdog('video_render', 'executing: ' . $command, array(), WATCHDOG_DEBUG);
-//   watchdog('video_render', 'Starting : ' . REQUEST_TIME);
-  //execute the command
-  ob_start();
-  passthru($command." 2>&1", $command_return);
-  $command_output = ob_get_contents();
-  ob_end_clean();
-//  watchdog('video_render', 'Completed');
-  //print $command_output;
-
-  if (!file_exists($job->convfile) || !filesize($job->convfile)) {
-    watchdog('video_render', 'video conversion failed. ffmpeg reported the following output: ' . $command_output, array(), WATCHDOG_ERROR);
-  //    _video_render_set_video_encoded_fid($job->nid, $job->vid, -1);
-  //    _video_render_job_change_status($job->nid, $job->vid, VIDEO_RENDERING_FAILED);
-  }
-  else {
-    $file_name = basename($job->filename . ".flv");
-    $file = new stdClass();
-    $file->uid      = $job->uid;
-    $file->status   = FILE_STATUS_PERMANENT;
-    $file->filename = basename($file_name);
-    $file->filepath = $job->convfile;
-    $file->filemime = file_get_mimetype($file_name);
-    $file->filesize = filesize($job->convfile);
-    $file->timestamp = REQUEST_TIME;
-
-    $job->converted = $file;
-  }
-}
-
-
-/**
- * Calculate the converted video size basing on the width set on administration.
- * Aspect ration is maintained.
- */
-//function _video_render_get_size() {
-//  return variable_get('video_zencoder_width', 640) . 'x' . variable_get('video_zencoder_height', 480);
-//}
-
-
-function _video_curl_post($url, $fields, &$output) {
-
-  $options = array(
-    CURLOPT_POST => TRUE,
-    CURLOPT_POSTFIELDS => $fields,
-    CURLOPT_CONNECTTIMEOUT => HTTP_CONNECT_TIMEOUT,
-    CURLOPT_LOW_SPEED_LIMIT => HTTP_LOW_SPEED_LIMIT,
-    CURLOPT_LOW_SPEED_TIME => HTTP_LOW_SPEED_TIMEOUT,
-    CURLOPT_RETURNTRANSFER => TRUE
-  );
-
-  $ch = curl_init($url);
-  curl_setopt_array($ch, $options);
-  $output = curl_exec($ch);
-  $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-  curl_close($ch);
-
-  return $http_code;
-}
-
-/** S3 API functions **/
-/** ---------------- **/