From 3cafdc0fe6c5ee83012f3ae1c7bf4d7ec9dca5b1 Mon Sep 17 00:00:00 2001 From: ddennedy Date: Tue, 4 Sep 2007 03:59:17 +0000 Subject: [PATCH] - configure: bump version - docs/policies.txt: add versioning and commit message policies - src/modules/jackrack/plugin_mgr.c: load ladspa plugins in subdirs git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@1025 d19143bc-622f-0410-bfdd-b5b2a6649095 --- configure | 2 +- docs/policies.txt | 20 ++++++++++++-------- src/modules/jackrack/plugin_mgr.c | 10 +++++++++- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/configure b/configure index a2f93e8c..5180e458 100755 --- a/configure +++ b/configure @@ -115,7 +115,7 @@ export build_dir=`dirname $0` export prefix=/usr/local export libdir="" export help=0 -export version=0.2.4 +export version=0.2.5 export debug=true export mmx=true export gpl=false diff --git a/docs/policies.txt b/docs/policies.txt index 4da3b605..5a5d2cea 100644 --- a/docs/policies.txt +++ b/docs/policies.txt @@ -4,28 +4,33 @@ by Dan Dennedy Policies -------- -Any contribution to the "core" module assign copyright to Ushodaya Enterprises -Limited because they need license control over that module. - -Comments in the framework and valerie header files must be C-style, not C++. +Any contribution to the "core" module must assign copyright to Ushodaya +Enterprises Limited because they need license control over that module. The framework and valerie client libraries are covered under LGPL. Miracle, inigo, albino, and humperdink applications are covered under GPL. Modules should strive to be LGPL to make them available through the framework as LGPL. +Comments in the framework and valerie header files must be C-style, not C++. + Coding Style: There are not a lot of rules, but we prefer brackets on their own line, indents using tabs, liberal usage of spaces in statements and expressions, and no hard line length. The code in src/framework serves as a good example. +Commit messages must be prefaced with the name of the changed files. This makes +the Subversion log more useful as a ChangeLog. For example, + docs/policies.txt: added policy about commit message + +Increment the version number in ./configure on the first commit after a release +as well as just prior to a new release. This way we can track if someone is +using an unreleased version from the source code repository. + Procedures ---------- Update services.txt when you add or update a service. -Until we convert to Subversion, which can provide a nice, comprehensive log -please update ChangeLog with every commit. - Setting Copyright on Appropriated Code: You do not want to be accused of copying someone's code and changing copyright or license without permission. The license is straightforward: you must retain @@ -45,4 +50,3 @@ First preference is to use the SourceForge tracker: http://sourceforge.net/tracker/?group_id=96039&atid=613414 Second preference is in the mailing list: mlt-devel@lists.sourceforge.net - diff --git a/src/modules/jackrack/plugin_mgr.c b/src/modules/jackrack/plugin_mgr.c index 7d2440f2..37d75104 100644 --- a/src/modules/jackrack/plugin_mgr.c +++ b/src/modules/jackrack/plugin_mgr.c @@ -34,6 +34,8 @@ #include #include #include +#include +#include #include "plugin_mgr.h" #include "plugin_desc.h" @@ -170,6 +172,8 @@ plugin_mgr_get_dir_plugins (plugin_mgr_t * plugin_mgr, const char * dir) while ( (dir_entry = readdir (dir_stream)) ) { + struct stat info; + if (strcmp (dir_entry->d_name, ".") == 0 || strcmp (dir_entry->d_name, "..") == 0) continue; @@ -185,7 +189,11 @@ plugin_mgr_get_dir_plugins (plugin_mgr_t * plugin_mgr, const char * dir) strcpy (file_name + dirlen + 1, dir_entry->d_name); } - plugin_mgr_get_object_file_plugins (plugin_mgr, file_name); + stat (file_name, &info); + if (S_ISDIR (info.st_mode)) + plugin_mgr_get_dir_plugins (plugin_mgr, file_name); + else + plugin_mgr_get_object_file_plugins (plugin_mgr, file_name); g_free (file_name); } -- 2.39.2