2.6 r7732 - patch fixes incorrect pluginSettings path on OSX

[nibbles]

Using 2.6 r7732 on Apple OSX, I think ADM_fileio.cpp may need adjusting so Avidemux can find pluginSettings.
I've seen main.cpp do this:

Code Select Expand

//***************Plugins *********************
// Load system wide audio decoder plugin
#ifdef __APPLE__
    const char *startDir="../lib";
#else
    const char *startDir=ADM_RELATIVE_LIB_DIR;
#endif
    char *adPlugins = ADM_getInstallRelativePath(startDir, ADM_PLUGIN_DIR, "audioDecoder");
    char *avPlugins = ADM_getInstallRelativePath(startDir, ADM_PLUGIN_DIR, "audioDevices");   
    char *aePlugins = ADM_getInstallRelativePath(startDir, ADM_PLUGIN_DIR, "audioEncoders");   

but ADM_fileio.cpp uses only the ADM_RELATIVE_LIB_DIR, which doesn't quite work:

Code Select Expand

const char *ADM_getSystemPluginSettingsDir(void)
{
    if(ADM_systemPluginSettings) return ADM_systemPluginSettings;
    ADM_systemPluginSettings=ADM_getInstallRelativePath(ADM_RELATIVE_LIB_DIR, ADM_PLUGIN_DIR, "pluginSettings");
    return ADM_systemPluginSettings;
}

yielding the path:

Code Select Expand

  [paintGL]  Painting dummy openGl widget
  [HandleAction]  ************ VIDEO_CODEC_CONFIGURE **************
  [ADM_pluginSystemPath]  System Plugin preset path : /usr/local/bin/lib/ADM_plugins6/pluginSettings//x264/1
  [ADM_pluginInstallSystem]  Looking for file .json in folder /usr/local/bin/lib/ADM_plugins6/pluginSettings//x264/1


So the patch would look something like this.
Ok thanks.

[Agent_007]

Bump this thread if Mean doesn't comment this during next week, so I remember to ticket this.

[nibbles]

bump.  thanks LM 

[mean]

Now would be a good time to give me your berlios ID so that i can grant you svn commit access.
(you must promise to be good though)