gephex--main--0.4--patch-1852

[email protected]
Newsgroups gmane.comp.video.gephex.devel
Message-ID <[email protected]>
Archive: [email protected]
New revision: gephex--main--0.4--patch-1852

--
Revision: gephex--main--0.4--patch-1852
Archive: [email protected]
Creator: The Gephex Source Archive <[email protected]>
Date: Fri Mar  4 21:05:53 CET 2005
Standard-date: 2005-03-04 20:05:53 GMT
New-files: qtgui/src/gui/base/.arch-ids/picmanager.cpp.id
    qtgui/src/gui/base/.arch-ids/picmanager.h.id
    qtgui/src/gui/base/picmanager.cpp
    qtgui/src/gui/base/picmanager.h
Removed-files: qtgui/src/gui/.arch-ids/inplugbusy.xpm.id
    qtgui/src/gui/.arch-ids/inplugfree.xpm.id
    qtgui/src/gui/.arch-ids/outplugbusy.xpm.id
    qtgui/src/gui/.arch-ids/outplugfree.xpm.id
    qtgui/src/gui/inplugbusy.xpm
    qtgui/src/gui/inplugfree.xpm
    qtgui/src/gui/outplugbusy.xpm
    qtgui/src/gui/outplugfree.xpm
Modified-files: NEWS config_h.win32 configure.ac
    engine/src/engine/controller.cpp
    modules/src/frbinmodule/frbinmodule.cpp
    modules/src/y4minmodule/y4minmodule.dep
    modules/src/y4minmodule/y4minmodule.dsp
    modules/src/y4minmodule/y4minmodule.mak
    qtgui/src/gui/Makefile.am
    qtgui/src/gui/base/Makefile.am
    qtgui/src/gui/base/base.dep qtgui/src/gui/base/base.dsp
    qtgui/src/gui/base/base.mak
    qtgui/src/gui/editor/editor.dep
    qtgui/src/gui/editor/grapheditor.cpp
    qtgui/src/gui/editor/grapheditor.h
    qtgui/src/gui/nodewidget.cpp qtgui/src/gui/nodewidget.h
New-patches: [email protected]/gephex--georg--0.4--patch-388
    [email protected]/gephex--georg--0.4--patch-389
    [email protected]/gephex--georg--0.4--patch-390
    [email protected]/gephex--georg--0.4--patch-391
    [email protected]/gephex--georg--0.4--patch-392
    [email protected]/gephex--georg--0.4--patch-393
    [email protected]/gephex--georg--0.4--patch-394
    [email protected]/gephex--georg--0.4--patch-395
    [email protected]/gephex--main--0.4--patch-1852
Summary: [MERGE-REQUEST] Fixed Bug #89, #100, changed version to 0.4.3, updated NEWS, updated win32 build system
Keywords: 

Patches applied:

 * [email protected]/gephex--georg--0.4--patch-388
   Added picmanager class

 * [email protected]/gephex--georg--0.4--patch-389
   Fixed mmx autoconf check

 * [email protected]/gephex--georg--0.4--patch-390
   plugwidgets now have color depending on type (bug #100)

 * [email protected]/gephex--georg--0.4--patch-391
   Removed obsolete icon files

 * [email protected]/gephex--georg--0.4--patch-392
   Changed version to 0.4.3

 * [email protected]/gephex--georg--0.4--patch-393
   Updated NEWS

 * [email protected]/gephex--georg--0.4--patch-394
   Fixed warning messages when a path could not be opened by the enigine (bug #89)

 * [email protected]/gephex--georg--0.4--patch-395
   Fixed some win32 compilation issues

* removed files

    qtgui/src/gui/.arch-ids/inplugbusy.xpm.id
    qtgui/src/gui/.arch-ids/inplugfree.xpm.id
    qtgui/src/gui/.arch-ids/outplugbusy.xpm.id
    qtgui/src/gui/.arch-ids/outplugfree.xpm.id
    qtgui/src/gui/inplugbusy.xpm
    qtgui/src/gui/inplugfree.xpm
    qtgui/src/gui/outplugbusy.xpm
    qtgui/src/gui/outplugfree.xpm

* added files

    qtgui/src/gui/base/.arch-ids/picmanager.cpp.id
    qtgui/src/gui/base/.arch-ids/picmanager.h.id
    qtgui/src/gui/base/picmanager.cpp
    qtgui/src/gui/base/picmanager.h
    {arch}/gephex/gephex--georg/gephex--georg--0.4/[email protected]/patch-log/patch-388
    {arch}/gephex/gephex--georg/gephex--georg--0.4/[email protected]/patch-log/patch-389
    {arch}/gephex/gephex--georg/gephex--georg--0.4/[email protected]/patch-log/patch-390
    {arch}/gephex/gephex--georg/gephex--georg--0.4/[email protected]/patch-log/patch-391
    {arch}/gephex/gephex--georg/gephex--georg--0.4/[email protected]/patch-log/patch-392
    {arch}/gephex/gephex--georg/gephex--georg--0.4/[email protected]/patch-log/patch-393
    {arch}/gephex/gephex--georg/gephex--georg--0.4/[email protected]/patch-log/patch-394
    {arch}/gephex/gephex--georg/gephex--georg--0.4/[email protected]/patch-log/patch-395
    {arch}/gephex/gephex--main/gephex--main--0.4/[email protected]/patch-log/patch-1852

* file metadata changed

    ./qtgui/src/gui/base/base.dep
        --permissions 755
        => --permissions 644
    ./qtgui/src/gui/editor/editor.dep
        --permissions 755
        => --permissions 644

* modified files

--- orig/NEWS
+++ mod/NEWS
@@ -1,3 +1,14 @@
+0.4.3:
+------
+
+  * support for Mac OS X
+
+  * ports of almost all effecTV effects
+
+  * some usability improvements
+
+  * fixed bugs #79, #81, #82, #83, #84, #86, #87, #89, #96, #100
+
 0.4.2:
 ------
 


--- orig/config_h.win32
+++ mod/config_h.win32
@@ -17,5 +17,6 @@
 
 #define WITH_FFMPEG
 #define WITH_SDL
+#define WITH_SDL_IMAGE
 
 #endif
\ No newline at end of file


--- orig/configure.ac
+++ mod/configure.ac
@@ -2,7 +2,7 @@
 AC_PREREQ(2.59) dnl force autoconf version
 AC_CONFIG_SRCDIR([base/src/utils/autoptr.h])
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(gephex,0.4.2)
+AM_INIT_AUTOMAKE(gephex,0.4.3)
 AM_CONFIG_HEADER(config.h)
 
 # Checks for programs.
@@ -44,7 +44,7 @@
 case $host in
 i[[3456]]86-*-*)
   AC_DEFINE([CPU_I386])
-  CPU=xi386
+  CPU=i386
   AC_MSG_RESULT([80x86 processor detected (x >= 3).])
  ;;
 *)


--- orig/engine/src/engine/controller.cpp
+++ mod/engine/src/engine/controller.cpp
@@ -120,49 +120,40 @@
 #error "unknown OS"
 #endif
 
-  //TODO: make recursive
   std::vector<std::string> getFilesInPath(const std::string& dirName,
                                           const std::string& ending)
   {
     std::vector<std::string> fileNames;
     
-    try
-      {
-        std::list<utils::DirEntry> entries;
-        utils::FileSystem::listDir(dirName, entries);
+    std::list<utils::DirEntry> entries;
+    utils::FileSystem::listDir(dirName, entries);
     
-        for (std::list<utils::DirEntry>::const_iterator it = entries.begin();
-             it != entries.end(); ++it)
-          {
-            std::string name = it->getName();
+    for (std::list<utils::DirEntry>::const_iterator it = entries.begin();
+         it != entries.end(); ++it)
+      {
+        std::string name = it->getName();
 
-            if (name == "." || name == "..")
-              continue;
+        if (name == "." || name == "..")
+          continue;
       
-            if (it->getType() == utils::DirEntry::DIRECTORY)
-              {
-                std::vector<std::string> 
-                  subfiles= getFilesInPath(name, ending);
+        if (it->getType() == utils::DirEntry::DIRECTORY)
+          {
+            std::vector<std::string> 
+              subfiles= getFilesInPath(name, ending);
 
-                fileNames.insert(fileNames.end(),
-                                 subfiles.begin(), subfiles.end());
-              }
-            else
+            fileNames.insert(fileNames.end(),
+                             subfiles.begin(), subfiles.end());
+          }
+        else
+          {
+            if (name.length() > ending.length() 
+                && name.substr(name.length()-ending.length(),
+                               ending.length()) == ending)
               {
-                if (name.length() > ending.length() 
-                    && name.substr(name.length()-ending.length(),
-                                   ending.length()) == ending)
-                  {
-                    fileNames.push_back(dirName + name);
-                  }
+                fileNames.push_back(dirName + name);
               }
           }
       }
-    catch (std::runtime_error& e)
-      {
-        std::cerr << "Could not open '" << dirName << "' ("
-                  << e.what() << ")
";
-      }
     return fileNames;
   }
   
@@ -180,11 +171,11 @@
         std::vector<std::string> fs = getFilesInPath(path, ending);
         files.insert(files.end(),fs.begin(), fs.end());
       }
-    catch (std::runtime_error& e)
+    catch (...)
       {
-        std::cerr << "Could not open '" << path << "' ("
-                  << e.what() << ")
";
+        // we ignore all paths we cannot open
       }
+
     return files;
   }
   


--- orig/modules/src/frbinmodule/frbinmodule.cpp
+++ mod/modules/src/frbinmodule/frbinmodule.cpp
@@ -363,8 +363,8 @@
 					       0 , 1920);
       const unsigned int user_ysize = trim_int(inst->in_y_size->number,
 					       0 , 1080);
-      const bool use_cache = strcmp(inst->in_cache->text, "yes");
-      const bool flush = trim_bool(inst->in_flush->number);
+      const bool use_cache = strcmp(inst->in_cache->text, "yes") == 0;
+      const bool flush = trim_bool(inst->in_flush->number) != 0;
       const std::string newFileName = inst->in_fileName->text;  
       const unsigned int frame_number = trim_int(inst->in_frame->number,
 						 0, INT_MAX);
@@ -487,7 +487,7 @@
               my->drv->decode_frame(pos, frb, xsize, ysize);
               s_cache->store(m_file_name, pos, xsize, ysize, frb);
             }          
-          catch (std::exception& e)
+          catch (...)
             {
               delete[] frb;
               frb = 0;


--- orig/modules/src/y4minmodule/y4minmodule.dep
+++ mod/modules/src/y4minmodule/y4minmodule.dep
@@ -1,6 +1,6 @@
 # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von y4minmodule.mak
 
-.\y4minmodule.c : \
+.\y4minmodule.cpp : \
 	"..\..\..
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.