From b4ef00c8d4e55fe7db3147da21cb4239fd3c428c Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 16 Jun 2009 19:44:15 -0700
Subject: Use a placeholder image if ffmpeg is missing instead of throwing an
 exception which would get silently swallowed by swfUpload.

---
 modules/gallery/helpers/graphics.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'modules/gallery/helpers/graphics.php')

diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index feebfb34..3f3317ae 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -135,7 +135,12 @@ class graphics_Core {
         if ($input_item->is_movie()) {
           // Convert the movie to a JPG first
           $output_file = preg_replace("/...$/", "jpg", $output_file);
-          movie::extract_frame($input_file, $output_file);
+          try {
+            movie::extract_frame($input_file, $output_file);
+          } catch (Exception $e) {
+            // Assuming this is MISSING_FFMPEG for now
+            copy(MODPATH . "gallery/images/missing_movie.png", $output_file);
+          }
           $working_file = $output_file;
         } else {
           $working_file = $input_file;
-- 
cgit v1.2.3


From abbecb9e7e6e26d50cae0754d4c6320892b8def5 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 24 Jun 2009 21:19:05 -0700
Subject: Look in /opt/local/bin for binaries, too. Fixes ticket #423.

---
 modules/gallery/helpers/graphics.php | 2 +-
 modules/gallery/helpers/movie.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/gallery/helpers/graphics.php')

diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index 3f3317ae..71b8ddd8 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -331,7 +331,7 @@ class graphics_Core {
     if (!isset($gd["GD Version"])) {
       $gd["GD Version"] = false;
     }
-    putenv("PATH=" . getenv("PATH") . ":/usr/local/bin");
+    putenv("PATH=" . getenv("PATH") . ":/usr/local/bin:/opt/local/bin");
     return array("gd" => $gd,
                  "imagemagick" => $exec ? dirname(exec("which convert")) : false,
                  "graphicsmagick" => $exec ? dirname(exec("which gm")) : false);
diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php
index 28c15d81..fcf1cc54 100644
--- a/modules/gallery/helpers/movie.php
+++ b/modules/gallery/helpers/movie.php
@@ -145,7 +145,7 @@ class movie_Core {
 
   static function find_ffmpeg() {
     if (!$ffmpeg_path = module::get_var("gallery", "ffmpeg_path")) {
-      putenv("PATH=" . getenv("PATH") . ":/usr/local/bin");
+      putenv("PATH=" . getenv("PATH") . ":/usr/local/bin:/opt/local/bin");
       if (function_exists("exec")) {
         $ffmpeg_path = exec("which ffmpeg");
       }
-- 
cgit v1.2.3