edl plugin names eng, fix segv for opengl brender, renderfarm rework strategy, perf...
authorGood Guy <[email protected]>
Sun, 7 Jan 2018 01:25:41 +0000 (18:25 -0700)
committerGood Guy <[email protected]>
Sun, 7 Jan 2018 01:25:41 +0000 (18:25 -0700)
173 files changed:
cinelerra-5.1/cinelerra/awindowgui.C
cinelerra-5.1/cinelerra/batchrender.C
cinelerra-5.1/cinelerra/batchrender.h
cinelerra-5.1/cinelerra/bdcreate.C
cinelerra-5.1/cinelerra/dvdcreate.C
cinelerra-5.1/cinelerra/effectlist.C
cinelerra-5.1/cinelerra/formattools.C
cinelerra-5.1/cinelerra/formattools.h
cinelerra-5.1/cinelerra/indexfile.C
cinelerra-5.1/cinelerra/menuattachtransition.C
cinelerra-5.1/cinelerra/menueffects.C
cinelerra-5.1/cinelerra/menueffects.h
cinelerra-5.1/cinelerra/mwindow.C
cinelerra-5.1/cinelerra/mwindow.h
cinelerra-5.1/cinelerra/performanceprefs.C
cinelerra-5.1/cinelerra/plugin.C
cinelerra-5.1/cinelerra/plugin.h
cinelerra-5.1/cinelerra/pluginarray.C
cinelerra-5.1/cinelerra/plugindialog.C
cinelerra-5.1/cinelerra/pluginserver.C
cinelerra-5.1/cinelerra/pluginserver.h
cinelerra-5.1/cinelerra/pluginset.C
cinelerra-5.1/cinelerra/recordprefs.C
cinelerra-5.1/cinelerra/render.C
cinelerra-5.1/cinelerra/render.h
cinelerra-5.1/cinelerra/renderprofiles.C
cinelerra-5.1/cinelerra/vrender.C
cinelerra-5.1/plugins/1080to480/1080to480.C
cinelerra-5.1/plugins/1080to540/1080to540.C
cinelerra-5.1/plugins/720to480/720to480.C
cinelerra-5.1/plugins/C41/c41.C
cinelerra-5.1/plugins/aging/aging.C
cinelerra-5.1/plugins/audioscope/audioscope.C
cinelerra-5.1/plugins/bandslide/bandslide.C
cinelerra-5.1/plugins/bandwipe/bandwipe.C
cinelerra-5.1/plugins/bluebanana/bluebanana.C
cinelerra-5.1/plugins/blur/blur.C
cinelerra-5.1/plugins/blurzoom/blurzoom.C
cinelerra-5.1/plugins/brightness/brightness.C
cinelerra-5.1/plugins/burn/burn.C
cinelerra-5.1/plugins/cdripper/cdripper.C
cinelerra-5.1/plugins/chromakey/chromakey.C
cinelerra-5.1/plugins/chromakeyhsv/chromakey.C
cinelerra-5.1/plugins/color3way/color3way.C
cinelerra-5.1/plugins/colorbalance/colorbalance.C
cinelerra-5.1/plugins/compressor/compressor.C
cinelerra-5.1/plugins/crikey/crikey.C
cinelerra-5.1/plugins/crossfade/crossfade.C
cinelerra-5.1/plugins/dbx/dbx.h
cinelerra-5.1/plugins/dcoffset/dcoffset.C
cinelerra-5.1/plugins/decimate/decimate.C
cinelerra-5.1/plugins/deinterlace-cv/deinterlace-cv.C
cinelerra-5.1/plugins/deinterlace/deinterlace.C
cinelerra-5.1/plugins/delayaudio/delayaudio.C
cinelerra-5.1/plugins/delayvideo/delayvideo.C
cinelerra-5.1/plugins/denoise/denoise.C
cinelerra-5.1/plugins/denoisefft/denoisefft.C
cinelerra-5.1/plugins/denoisemjpeg/denoisemjpeg.C
cinelerra-5.1/plugins/denoiseseltempavg/seltempavg.C
cinelerra-5.1/plugins/denoisevideo/denoisevideo.C
cinelerra-5.1/plugins/despike/despike.C
cinelerra-5.1/plugins/diffkey/diffkey.C
cinelerra-5.1/plugins/dissolve/dissolve.C
cinelerra-5.1/plugins/dot/dot.C
cinelerra-5.1/plugins/downsample/downsample.C
cinelerra-5.1/plugins/echo/echo.C
cinelerra-5.1/plugins/echocancel/echocancel.C
cinelerra-5.1/plugins/edge/edge.C
cinelerra-5.1/plugins/fieldframe/fieldframe.C
cinelerra-5.1/plugins/findobj/findobj.C
cinelerra-5.1/plugins/flash/flash.C
cinelerra-5.1/plugins/flip/flip.C
cinelerra-5.1/plugins/framefield/framefield.C
cinelerra-5.1/plugins/freeverb/freeverb.C
cinelerra-5.1/plugins/freezeframe/freezeframe.C
cinelerra-5.1/plugins/gain/gain.C
cinelerra-5.1/plugins/gamma/gamma.C
cinelerra-5.1/plugins/gradient/gradient.C
cinelerra-5.1/plugins/graphic/graphic.C
cinelerra-5.1/plugins/greycstoration/greycstorationplugin.C
cinelerra-5.1/plugins/histeq/histeq.C
cinelerra-5.1/plugins/histogram/histogram.C
cinelerra-5.1/plugins/histogram_bezier/bistogram.C
cinelerra-5.1/plugins/holo/holo.C
cinelerra-5.1/plugins/huesaturation/huesaturation.C
cinelerra-5.1/plugins/interpolate/interpolate.C
cinelerra-5.1/plugins/interpolateall/interpolateall.C
cinelerra-5.1/plugins/interpolateaudio/interpolateaudio.C
cinelerra-5.1/plugins/interpolatevideo/interpolatevideo.C
cinelerra-5.1/plugins/invertaudio/invert.C
cinelerra-5.1/plugins/invertvideo/invert.C
cinelerra-5.1/plugins/irissquare/irissquare.C
cinelerra-5.1/plugins/ivtc/ivtc.C
cinelerra-5.1/plugins/lens/lens.C
cinelerra-5.1/plugins/level/leveleffect.C
cinelerra-5.1/plugins/linearblur/linearblur.C
cinelerra-5.1/plugins/liveaudio/liveaudio.C
cinelerra-5.1/plugins/livevideo/livevideo.C
cinelerra-5.1/plugins/loopaudio/loopaudio.C
cinelerra-5.1/plugins/loopvideo/loopvideo.C
cinelerra-5.1/plugins/motion-cv/motion-cv.C
cinelerra-5.1/plugins/motion-hv/motion-hv.C
cinelerra-5.1/plugins/motion/motion.C
cinelerra-5.1/plugins/motion2point/motion.C
cinelerra-5.1/plugins/motion51/motion51.C
cinelerra-5.1/plugins/motionblur/motionblur.C
cinelerra-5.1/plugins/normalize/normalize.C
cinelerra-5.1/plugins/oilpainting/oil.C
cinelerra-5.1/plugins/overlay/overlay.C
cinelerra-5.1/plugins/overlayaudio/overlayaudio.C
cinelerra-5.1/plugins/parametric/parametric.C
cinelerra-5.1/plugins/perspective/perspective.C
cinelerra-5.1/plugins/photoscale/photoscale.C
cinelerra-5.1/plugins/piano/piano.C
cinelerra-5.1/plugins/piano/piano.h
cinelerra-5.1/plugins/pitch/pitch.C
cinelerra-5.1/plugins/polar/polar.C
cinelerra-5.1/plugins/radialblur/radialblur.C
cinelerra-5.1/plugins/reframe/reframe.C
cinelerra-5.1/plugins/reframert/reframert.C
cinelerra-5.1/plugins/removegaps/removegaps.C
cinelerra-5.1/plugins/reroute/reroute.C
cinelerra-5.1/plugins/resample/resample.C
cinelerra-5.1/plugins/resamplert/resamplert.C
cinelerra-5.1/plugins/reverb/reverb.C
cinelerra-5.1/plugins/reverseaudio/reverseaudio.C
cinelerra-5.1/plugins/reversevideo/reversevideo.C
cinelerra-5.1/plugins/rgb601/ivtc.C.2
cinelerra-5.1/plugins/rgb601/rgb601.C
cinelerra-5.1/plugins/rgbshift/rgbshift.C
cinelerra-5.1/plugins/rotate/rotate.C
cinelerra-5.1/plugins/rumbler/rumbler.C
cinelerra-5.1/plugins/scale/scale.C
cinelerra-5.1/plugins/scaleratio/scaleratio.C
cinelerra-5.1/plugins/shapewipe/shapewipe.C
cinelerra-5.1/plugins/sharpen/sharpen.C
cinelerra-5.1/plugins/shiftinterlace/shiftinterlace.C
cinelerra-5.1/plugins/slide/slide.C
cinelerra-5.1/plugins/spectrogram/spectrogram.C
cinelerra-5.1/plugins/spherecam/spherecam.C.bak
cinelerra-5.1/plugins/svg/svg.C
cinelerra-5.1/plugins/swapchannels/swapchannels.C
cinelerra-5.1/plugins/swapframes/swapframes.C
cinelerra-5.1/plugins/synthesizer/synthesizer.C
cinelerra-5.1/plugins/theme_blond/blondtheme.C
cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C
cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C.orig
cinelerra-5.1/plugins/theme_blue/bluetheme.C
cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C
cinelerra-5.1/plugins/theme_bright/brighttheme.C
cinelerra-5.1/plugins/theme_hulk/hulktheme.C
cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C
cinelerra-5.1/plugins/theme_suv/suv.C
cinelerra-5.1/plugins/theme_unflat/unflattheme.C
cinelerra-5.1/plugins/threshold/threshold.C
cinelerra-5.1/plugins/timeavg/timeavg.C
cinelerra-5.1/plugins/timefront/timefront.C
cinelerra-5.1/plugins/timestretch/timestretch.C
cinelerra-5.1/plugins/timestretchrt/timestretchrt.C
cinelerra-5.1/plugins/titler/titler.C
cinelerra-5.1/plugins/translate/translate.C
cinelerra-5.1/plugins/unsharp/unsharp.C
cinelerra-5.1/plugins/videoscope/videoscope.C
cinelerra-5.1/plugins/vocoder/vocoder.C
cinelerra-5.1/plugins/wave/wave.C
cinelerra-5.1/plugins/whirl/whirl.C
cinelerra-5.1/plugins/whirl/whirl.h
cinelerra-5.1/plugins/wipe/wipe.C
cinelerra-5.1/plugins/yuv/yuv.C
cinelerra-5.1/plugins/yuv411/yuv411.C
cinelerra-5.1/plugins/yuvshift/yuvshift.C
cinelerra-5.1/plugins/zoom/zoom.C
cinelerra-5.1/plugins/zoomblur/zoomblur.C

index a50f21a2280ddea161a53c28a9413449be399269..ae74854b19e0517640e164b042943dc5a9c97b42 100644 (file)
@@ -328,7 +328,7 @@ void AssetPicon::create_objects()
        }
        else
        if( plugin ) {
-               strcpy(name,  plugin->title);
+               strcpy(name, _(plugin->title));
                set_text(name);
                icon_vframe = plugin->get_picon();
                if( icon_vframe )
index 62ef2955b2a6b48ffb2acda58d5548e380cf7c4b..0b0e9d01544f0f58c197ef81ee7de82fc356c2d9 100644 (file)
@@ -92,12 +92,13 @@ int BatchRenderMenuItem::handle_event()
 
 
 
-BatchRenderJob::BatchRenderJob(Preferences *preferences)
+BatchRenderJob::BatchRenderJob(Preferences *preferences, int strategy)
 {
        this->preferences = preferences;
+       this->strategy = strategy;
+       file_per_label = 0;
        asset = new Asset;
        edl_path[0] = 0;
-       strategy = 0;
        enabled = 1;
        elapsed = 0;
 }
@@ -122,10 +123,9 @@ void BatchRenderJob::load(FileXML *file)
 
        edl_path[0] = 0;
        file->tag.get_property("EDL_PATH", edl_path);
-       strategy = file->tag.get_property("STRATEGY", strategy);
+       strategy = file->tag.get_property("STRATEGY", get_strategy());
        enabled = file->tag.get_property("ENABLED", enabled);
        elapsed = file->tag.get_property("ELAPSED", elapsed);
-       fix_strategy();
 
        result = file->read_tag();
        if(!result)
@@ -148,7 +148,7 @@ void BatchRenderJob::load(FileXML *file)
 void BatchRenderJob::save(FileXML *file)
 {
        file->tag.set_property("EDL_PATH", edl_path);
-       file->tag.set_property("STRATEGY", strategy);
+       file->tag.set_property("STRATEGY", get_strategy());
        file->tag.set_property("ENABLED", enabled);
        file->tag.set_property("ELAPSED", elapsed);
        file->append_tag();
@@ -177,20 +177,13 @@ void BatchRenderJob::save(FileXML *file)
        file->append_newline();
 }
 
-void BatchRenderJob::fix_strategy()
+int BatchRenderJob::get_strategy()
 {
-       strategy = Render::fix_strategy(strategy, preferences->use_renderfarm);
+       return strategy >= 0 ? strategy :
+               Render::get_strategy(preferences->use_renderfarm, file_per_label);
 }
 
 
-
-
-
-
-
-
-
-
 BatchRenderThread::BatchRenderThread(MWindow *mwindow)
  : BC_DialogThread()
 {
@@ -323,7 +316,6 @@ void BatchRenderThread::load_defaults(BC_Hash *defaults)
        {
                default_job->asset->load_defaults(defaults,
                        "BATCHRENDER_", 1, 1, 1, 1, 1);
-               default_job->fix_strategy();
        }
 
        for(int i = 0; i < BATCHRENDER_COLUMNS; i++)
@@ -336,20 +328,17 @@ void BatchRenderThread::load_defaults(BC_Hash *defaults)
 
 void BatchRenderThread::save_defaults(BC_Hash *defaults)
 {
-       if(default_job)
-       {
+       if( default_job ) {
                default_job->asset->save_defaults(defaults,
                        "BATCHRENDER_", 1, 1, 1, 1, 1);
-               defaults->update("BATCHRENDER_STRATEGY", default_job->strategy);
        }
-       for(int i = 0; i < BATCHRENDER_COLUMNS; i++)
-       {
+       for( int i=0; i<BATCHRENDER_COLUMNS; ++i ) {
                char string[BCTEXTLEN];
                sprintf(string, "BATCHRENDER_COLUMN%d", i);
                defaults->update(string, column_width[i]);
        }
 //     defaults->update("BATCHRENDER_JOB", current_job);
-       if(mwindow)
+       if( mwindow )
                mwindow->save_defaults();
        else
                defaults->save();
@@ -534,7 +523,7 @@ void BatchRenderThread::calculate_dest_paths(ArrayList<char*> *paths,
                        packages->create_packages(mwindow,
                                command->get_edl(),
                                preferences,
-                               job->strategy,
+                               job->get_strategy(),
                                job->asset,
                                command->start_position,
                                command->end_position,
@@ -757,7 +746,7 @@ void BatchRenderGUI::create_objects()
        format_tools = new BatchFormat(mwindow, this, thread->get_current_asset());
        format_tools->set_w(get_w() / 2);
        format_tools->create_objects(x1, y1, 1, 1, 1, 1, 0, 1, 0, 0,
-                       &thread->get_current_job()->strategy, 0);
+                       &thread->get_current_job()->file_per_label, 0);
 
 // input EDL
        add_subwindow(edl_path_title = new BC_Title(x2, y2, _("EDL Path:")));
@@ -965,7 +954,7 @@ void BatchRenderGUI::create_list(int update_widget)
 void BatchRenderGUI::change_job()
 {
        BatchRenderJob *job = thread->get_current_job();
-       format_tools->update(job->asset, &job->strategy);
+       format_tools->update(job->asset, &job->file_per_label);
        edl_path_text->update(job->edl_path);
 }
 
index 356ebf7e82fa476275b37e936f7bc6214be29c47..6dfcabb4b5d301ad7ef3f4ad4812c32991d7273f 100644 (file)
@@ -54,19 +54,20 @@ public:
 class BatchRenderJob
 {
 public:
-       BatchRenderJob(Preferences *preferences);
+       BatchRenderJob(Preferences *preferences, int strategy=-1);
        ~BatchRenderJob();
 
        void copy_from(BatchRenderJob *src);
        void load(FileXML *file);
        void save(FileXML *file);
-       void fix_strategy();
+       int get_strategy();
 
 // Source EDL to render
        char edl_path[BCTEXTLEN];
 // Destination file for output
        Asset *asset;
        int strategy;
+       int file_per_label;
        int enabled;
 // Amount of time elapsed in last render operation
        double elapsed;
index 3ed07e48d70f96671535c9856f0362425b06c808..57f40ea996546ac07785e068de9bd57afa81bb39 100644 (file)
@@ -226,12 +226,12 @@ int CreateBD_Thread::create_bd_jobs(ArrayList<BatchRenderJob*> *jobs, const char
        fprintf(fp,"#!/bin/bash -ex\n");
        fprintf(fp,"PATH=$PATH:%s\n",exec_path);
        fprintf(fp,"mkdir -p $1/udfs\n");
-       fprintf(fp,"sz=`du -sb $1/bd.m2ts | sed -e 's/[ \t].*//'`\n");
+       fprintf(fp,"sz=`du -cb $1/bd.m2ts* | tail -1 | sed -e 's/[ \t].*//'`\n");
        fprintf(fp,"blks=$((sz/2048 + 4096))\n");
        fprintf(fp,"rm -f %s\n", udfs);
        fprintf(fp,"mkudffs %s $blks\n", udfs);
        fprintf(fp,"mount %s%s\n", mopts, mntpt);
-       fprintf(fp,"bdwrite %s $1/bd.m2ts\n",mntpt);
+       fprintf(fp,"bdwrite %s $1/bd.m2ts*\n",mntpt);
        fprintf(fp,"umount %s\n",mntpt);
        if( is_usr_mnt )
                fprintf(fp,"mv -f %s $1/bd.udfs\n", udfs);
@@ -925,14 +925,13 @@ option_presets()
                                        use_scale = Rescale::scaled;
                        }
                        for( int i=0; i<trk->plugin_set.size(); ++i ) {
-                               for(Plugin *plugin = (Plugin*)trk->plugin_set[i]->first;
-                                               plugin;
-                                               plugin = (Plugin*)plugin->next) {
-                                       if( !strcmp(plugin->title, _("Deinterlace")) )
+                               for( Plugin *plugin = (Plugin*)trk->plugin_set[i]->first;
+                                               plugin; plugin=(Plugin*)plugin->next ) {
+                                       if( !strcmp(plugin->title, "Deinterlace") )
                                                has_deinterlace = 1;
-                                       if( !strcmp(plugin->title, _("Auto Scale")) ||
-                                           !strcmp(plugin->title, _("Scale Ratio")) ||
-                                           !strcmp(plugin->title, _("Scale")) )
+                                       if( !strcmp(plugin->title, "Auto Scale") ||
+                                           !strcmp(plugin->title, "Scale Ratio") ||
+                                           !strcmp(plugin->title, "Scale") )
                                                has_scale = 1;
                                }
                        }
index e7eb1db2c127da9f68d52896610b4cd1da1c16b3..cb8214a9b53cd04a55d7f1af37a6ee2b27e1468d 100644 (file)
@@ -16,6 +16,7 @@
 #include "mwindowgui.h"
 #include "plugin.h"
 #include "pluginset.h"
+#include "preferences.h"
 #include "rescale.h"
 #include "track.h"
 #include "tracks.h"
@@ -183,8 +184,10 @@ int CreateDVD_Thread::create_dvd_jobs(ArrayList<BatchRenderJob*> *jobs, const ch
        fprintf(fp,"\n");
        const char *exec_path = File::get_cinlib_path();
        fprintf(fp,"PATH=$PATH:%s\n",exec_path);
+       if( mwindow->preferences->use_renderfarm )
+               fprintf(fp,"cat > $1/dvd.m2v $1/dvd.m2v0*\n");
        if( !use_ffmpeg ) {
-               fprintf(fp,"mplex -f 8 -o $1/dvd.mpg $1/dvd.m2v $1/dvd.ac3\n");
+               fprintf(fp,"mplex -M -f 8 -o $1/dvd.mpg $1/dvd.m2v $1/dvd.ac3\n");
                fprintf(fp,"\n");
        }
        fprintf(fp,"rm -rf $1/iso\n");
@@ -334,7 +337,7 @@ int CreateDVD_Thread::create_dvd_jobs(ArrayList<BatchRenderJob*> *jobs, const ch
                asset->vmpeg_preset = 8;
                asset->vmpeg_field_order = 0;
                asset->vmpeg_pframe_distance = 0;
-               job = new BatchRenderJob(mwindow->preferences);
+               job = new BatchRenderJob(mwindow->preferences, SINGLE_PASS);
                jobs->append(job);
                strcpy(&job->edl_path[0], xml_filename);
                asset = job->asset;
@@ -966,14 +969,13 @@ option_presets()
                                if( !EQUIV(aspect, dvd_aspect) ) use_scale = Rescale::scaled;
                        }
                        for( int i=0; i<trk->plugin_set.size(); ++i ) {
-                               for(Plugin *plugin = (Plugin*)trk->plugin_set[i]->first;
-                                               plugin;
-                                               plugin = (Plugin*)plugin->next) {
-                                       if( !strcmp(plugin->title, _("Deinterlace")) )
+                               for( Plugin *plugin = (Plugin*)trk->plugin_set[i]->first;
+                                               plugin; plugin=(Plugin*)plugin->next ) {
+                                       if( !strcmp(plugin->title, "Deinterlace") )
                                                has_deinterlace = 1;
-                                       if( !strcmp(plugin->title, _("Auto Scale")) ||
-                                           !strcmp(plugin->title, _("Scale Ratio")) ||
-                                           !strcmp(plugin->title, _("Scale")) )
+                                       if( !strcmp(plugin->title, "Auto Scale") ||
+                                           !strcmp(plugin->title, "Scale Ratio") ||
+                                           !strcmp(plugin->title, "Scale") )
                                                has_scale = 1;
                                }
                        }
index bc7e5e3fac480d8dfd95d1c265954d94a5980857..2f9a5dbadc39c29c322264d437b5b3010c81cfc6 100644 (file)
@@ -50,7 +50,7 @@ void EffectTipDialog::start(int x, int y, const char *effect, const char *text)
        close_window();
        AWindowGUI *gui = awindow->gui;
        char string[BCTEXTLEN];
-       sprintf(string, _("Effect info: %s"), effect);
+       sprintf(string, _("Effect info: %s"), _(effect));
        int effect_w = BC_Title::calculate_w(gui, string);
        int text_w = BC_Title::calculate_w(gui, text);
        int text_h = BC_Title::calculate_h(gui, text);
index ea74b396e3c3c37e8825364f3bce49814112cdeb..711167215e4ed3fcc9f717887f6c4b807ead86d7 100644 (file)
@@ -76,7 +76,7 @@ FormatTools::FormatTools(MWindow *mwindow,
        prompt_audio_channels = 0;
        prompt_video = 0;
        prompt_video_compression = 0;
-       strategy = 0;
+       file_per_label = 0;
        locked_compressor = 0;
        video_driver = 0;
 }
@@ -111,7 +111,7 @@ void FormatTools::create_objects(
                int prompt_video_compression,
                const char *locked_compressor,
                int recording,
-               int *strategy,
+               int *file_per_label,
                int brender,
                int horizontal_layout)
 {
@@ -129,31 +129,10 @@ void FormatTools::create_objects(
        this->prompt_audio_channels = prompt_audio_channels;
        this->prompt_video = prompt_video;
        this->prompt_video_compression = prompt_video_compression;
-       this->strategy = strategy;
+       this->file_per_label = file_per_label;
 
 //printf("FormatTools::create_objects 1\n");
 
-// Modify strategy depending on render farm
-       if(strategy)
-       {
-               if(mwindow->preferences->use_renderfarm)
-               {
-                       if(*strategy == FILE_PER_LABEL)
-                               *strategy = FILE_PER_LABEL_FARM;
-                       else
-                       if(*strategy == SINGLE_PASS)
-                               *strategy = SINGLE_PASS_FARM;
-               }
-               else
-               {
-                       if(*strategy == FILE_PER_LABEL_FARM)
-                               *strategy = FILE_PER_LABEL;
-                       else
-                       if(*strategy == SINGLE_PASS_FARM)
-                               *strategy = SINGLE_PASS;
-               }
-       }
-
        if(!recording)
        {
                int px = x;
@@ -257,9 +236,9 @@ void FormatTools::create_objects(
 //printf("FormatTools::create_objects 11\n");
 
        x = init_x;
-       if(strategy)
-       {
-               window->add_subwindow(multiple_files = new FormatMultiple(mwindow, x, y, strategy));
+       if( file_per_label ) {
+               multiple_files = new FormatMultiple(mwindow, x, y, file_per_label);
+               window->add_subwindow(multiple_files);
                y += multiple_files->get_h() + 10;
        }
 
@@ -439,19 +418,14 @@ void FormatTools::update_extension()
        }
 }
 
-void FormatTools::update(Asset *asset, int *strategy)
+void FormatTools::update(Asset *asset, int *file_per_label)
 {
        this->asset = asset;
-       this->strategy = strategy;
-
-       if(path_textbox)
-               path_textbox->update(asset->path);
+       this->file_per_label = file_per_label;
+       if( file_per_label ) multiple_files->update(file_per_label);
+       if( path_textbox ) path_textbox->update(asset->path);
        format_text->update(File::formattostr(asset->format));
        update_format();
-       if(strategy)
-       {
-               multiple_files->update(strategy);
-       }
        close_format_windows();
 }
 
@@ -553,8 +527,7 @@ void FormatTools::reposition_window(int &init_x, int &init_y)
                x = init_x;
        }
 
-       if(strategy)
-       {
+       if( file_per_label ) {
                multiple_files->reposition_window(x, y);
                y += multiple_files->get_h() + 10;
        }
@@ -864,10 +837,7 @@ int FormatToTracks::handle_event()
 
 
 FormatMultiple::FormatMultiple(MWindow *mwindow, int x, int y, int *output)
- : BC_CheckBox(x,
-       y,
-       (*output == FILE_PER_LABEL) || (*output == FILE_PER_LABEL_FARM),
-       _("Create new file at each label"))
+ : BC_CheckBox(x, y, *output, _("Create new file at each label"))
 {
        this->output = output;
        this->mwindow = mwindow;
@@ -879,31 +849,14 @@ FormatMultiple::~FormatMultiple()
 
 int FormatMultiple::handle_event()
 {
-       if(get_value())
-       {
-               if(mwindow->preferences->use_renderfarm)
-                       *output = FILE_PER_LABEL_FARM;
-               else
-                       *output = FILE_PER_LABEL;
-       }
-       else
-       {
-               if(mwindow->preferences->use_renderfarm)
-                       *output = SINGLE_PASS_FARM;
-               else
-                       *output = SINGLE_PASS;
-       }
+       *output = get_value();
        return 1;
 }
 
 void FormatMultiple::update(int *output)
 {
        this->output = output;
-       if(*output == FILE_PER_LABEL_FARM ||
-               *output ==FILE_PER_LABEL)
-               set_value(1);
-       else
-               set_value(0);
+       set_value(*output ? 1 : 0);
 }
 
 
index d4c7761b0f7f635151a0759379e7a805a89e0203..9f49c04fdce5a2ad137b980774c3b7ff66018309 100644 (file)
@@ -64,7 +64,7 @@ public:
                                                int prompt_video_compression,
                                                const char *locked_compressor,  // Select compressors to be offered
                                                int recording, // Change captions for recording
-                                               int *strategy,  // If nonzero, prompt for insertion strategy
+                                               int *file_per_label,  // prompt if nonzero
                                                int brender,   // Supply file formats for background rendering
                                                int horizontal_layout = 0);
 // In recording preferences, aspects of the format are locked
@@ -75,7 +75,7 @@ public:
 
        void reposition_window(int &init_x, int &init_y);
 // Put new asset's parameters in and change asset.
-       void update(Asset *asset, int *strategy);
+       void update(Asset *asset, int *file_per_label);
 // Update filename extension when format is changed.
        void update_extension();
        void close_format_windows();
@@ -127,7 +127,7 @@ public:
        int prompt_audio_channels;
        int prompt_video;
        int prompt_video_compression;
-       int *strategy;
+       int *file_per_label;
        int w;
 // Determines what the configuration buttons do.
        int video_driver;
index 61e81cb5e48070f76c3ec0a871d2ba6c883b2275..eb9184f91a7e589e7582d979195997eefe5eda0e 100644 (file)
@@ -103,12 +103,12 @@ static int udf_volume_id(const char *path, char *fname)
                if( strncmp(ISO_STANDARD_ID,id.id,sizeof(id.id)) ) continue;
                // look for volume_id
                if( !isalnum(id.volume_id[0]) ) continue;
-               char *bp = &id.volume_id[0], *cp = fname;
+               char *bp = (char*)&id.volume_id[0], *cp = fname;
                for( int i=0; i<(int)sizeof(id.volume_id); ++i ) *cp++ = *bp++;
                while( --cp>=fname && *cp==' ' ) *cp = 0;
                if( !*fname ) continue;
                // fname = volume_id _ creation_date
-               ++cp;  *cp++ = '_';  bp = &id.creation_date[0];
+               ++cp;  *cp++ = '_';  bp = (char*)&id.creation_date[0];
                for( int i=0; i<(int)sizeof(id.creation_date)-1; ++i ) {
                        if( !isdigit(*bp) ) break;
                        *cp++ = *bp++;
index 6971ed1d80c1829606ba4c9d466040c9ccc1eaae..143bcdb9a79655cae094ca34d4af376d39b993c8 100644 (file)
@@ -82,9 +82,9 @@ void TransitionDialogThread::start()
                mwindow->search_plugindb(data_type == TRACK_AUDIO,
                        data_type == TRACK_VIDEO, 0, 1, 0, plugindb);
                for(int i = 0; i < plugindb.total; i++) {
-                       const char *title = _(plugindb.values[i]->title);
+                       const char *title = plugindb.values[i]->title;
                        if( !strcmp(transition_title, title) ) number = i;
-                       transition_names.append(new BC_ListBoxItem(title));
+                       transition_names.append(new BC_ListBoxItem(_(title)));
                }
        }
 
index 12f43384e0cb34d8ca7fc8c1bba19fb13cfdf90a..34881cf44f647d2d3df3e45ca3ea0c36f74092fc 100644 (file)
@@ -169,27 +169,15 @@ void MenuEffectThread::run()
        get_derived_attributes(default_asset, defaults);
 //     to_tracks = defaults->get("RENDER_EFFECT_TO_TRACKS", 1);
        load_mode = defaults->get("RENDER_EFFECT_LOADMODE", LOADMODE_PASTE);
-       strategy = defaults->get("RENDER_EFFECT_STRATEGY", SINGLE_PASS);
+       file_per_label = defaults->get("RENDER_FILE_PER_LABEL", 0);
 
 // get plugin information
-       int need_plugin;
-       if(!strlen(title))
-               need_plugin = 1;
-       else
-               need_plugin = 0;
-
+       int need_plugin = !strlen(title) ? 1 : 0;
 // generate a list of plugins for the window
-       if(need_plugin)
-       {
+       if( need_plugin ) {
                mwindow->search_plugindb(default_asset->audio_data,
-                       default_asset->video_data,
-                       -1,
-                       0,
-                       0,
-                       local_plugindb);
-
-               for(int i = 0; i < local_plugindb.total; i++)
-               {
+                       default_asset->video_data, -1, 0, 0, local_plugindb);
+               for(int i = 0; i < local_plugindb.total; i++) {
                        plugin_list.append(new BC_ListBoxItem(_(local_plugindb.values[i]->title)));
                }
        }
@@ -219,7 +207,7 @@ void MenuEffectThread::run()
 // save defaults
        save_derived_attributes(default_asset, defaults);
        defaults->update("RENDER_EFFECT_LOADMODE", load_mode);
-       defaults->update("RENDER_EFFECT_STRATEGY", strategy);
+       defaults->update("RENDER_EFFECT_FILE_PER_LABEL", file_per_label);
        mwindow->save_defaults();
 
 // get plugin server to use and delete the plugin list
@@ -372,6 +360,7 @@ void MenuEffectThread::run()
                default_asset->height = mwindow->edl->session->output_h;
        }
 
+       int strategy = Render::get_strategy(mwindow->preferences->use_renderfarm, file_per_label);
 // Process the total length in fragments
        ArrayList<MenuEffectPacket*> packets;
        if(!result)
@@ -629,7 +618,7 @@ void MenuEffectWindow::create_objects()
        add_subwindow(file_title = new BC_Title(
                mwindow->theme->menueffect_file_x,
                mwindow->theme->menueffect_file_y,
-               (char*)((menueffects->strategy == FILE_PER_LABEL  || menueffects->strategy == FILE_PER_LABEL_FARM) ?
+               (char*)(menueffects->file_per_label ?
                        _("Select the first file to render to:") :
                        _("Select a file to render to:"))));
 
@@ -638,18 +627,8 @@ void MenuEffectWindow::create_objects()
        format_tools = new FormatTools(mwindow,
                                        this,
                                        asset);
-       format_tools->create_objects(x,
-                                       y,
-                                       asset->audio_data,
-                                       asset->video_data,
-                                       0,
-                                       0,
-                                       0,
-                                       1,
-                                       0,
-                                       0,
-                                       &menueffects->strategy,
-                                       0);
+       format_tools->create_objects(x, y, asset->audio_data, asset->video_data,
+               0, 0, 0, 1, 0, 0, &menueffects->file_per_label, 0);
 
        loadmode = new LoadMode(mwindow, this, x, y, &menueffects->load_mode, 1);
        loadmode->create_objects();
index 798beba81598dd9dec7bde1ce1d44f18bae74812..6ad0cb92a480a97097d1ae190fa67da639c5420f 100644 (file)
@@ -85,7 +85,7 @@ public:
        MenuEffects *menu_item;
        char title[BCTEXTLEN];
        int realtime, load_mode;
-       int strategy;
+       int file_per_label;
 // GUI Plugins to delete
        ArrayList<PluginServer*> *dead_plugins;
 
index 4c875c977ab2ced35fec37a8ee03595c76c70d7b..1de35cb915b1da82e6fa4dd25292a9c7db759477 100644 (file)
@@ -872,6 +872,20 @@ PluginServer* MWindow::scan_plugindb(char *title,
        return 0;
 }
 
+// repair session files with xlated plugin titles
+void MWindow::fix_plugin_title(char *title)
+{
+       for(int i = 0; i < plugindb->total; i++) {
+               PluginServer *server = plugindb->get(i);
+               if( !server->title ) continue;
+               const char *server_title = server->title;
+               if( !bstrcasecmp(title, _(server_title)) ) {
+                       strcpy(title, server_title);
+                       return;
+               }
+       }
+}
+
 int MWindow::plugin_exists(const char *plugin_path, ArrayList<PluginServer*> &plugins)
 {
        for( int i=0; i<plugins.size(); ++i )
@@ -1034,7 +1048,7 @@ void MWindow::init_theme()
                fprintf(stderr, _("MWindow::init_theme: prefered theme %s not found.\n"),
                         preferences->theme);
 
-       const char *default_theme = _(DEFAULT_THEME);
+       const char *default_theme = DEFAULT_THEME;
        if( !theme_plugin && strcasecmp(preferences->theme, default_theme) ) {
                fprintf(stderr, _("MWindow::init_theme: trying default theme %s\n"),
                        default_theme);
@@ -2199,74 +2213,37 @@ void MWindow::test_plugins(EDL *new_edl, char *path)
 {
        char string[BCTEXTLEN];
 
-// Do a check weather plugins exist
-       for(Track *track = new_edl->tracks->first; track; track = track->next)
-       {
-               for(int k = 0; k < track->plugin_set.total; k++)
-               {
+// Do a check whether plugins exist
+       for( Track *track=new_edl->tracks->first; track; track=track->next ) {
+               for( int k=0; k<track->plugin_set.total; ++k ) {
                        PluginSet *plugin_set = track->plugin_set[k];
-                       for(Plugin *plugin = (Plugin*)plugin_set->first;
-                               plugin;
-                               plugin = (Plugin*)plugin->next)
-                       {
-                               if(plugin->plugin_type == PLUGIN_STANDALONE)
-                               {
+                       for( Plugin *plugin = (Plugin*)plugin_set->first;
+                                       plugin; plugin = (Plugin*)plugin->next ) {
+                               if( plugin->plugin_type != PLUGIN_STANDALONE ) continue;
 // ok we need to find it in plugindb
-                                       int plugin_found = 0;
-
-                                       for(int j = 0; j < plugindb->size(); j++)
-                                       {
-                                               PluginServer *server = plugindb->get(j);
-                                               if(server->title &&
-                                                       !strcasecmp(server->title, plugin->title) &&
-                                                       ((track->data_type == TRACK_AUDIO && server->audio) ||
-                                                       (track->data_type == TRACK_VIDEO && server->video)) &&
-                                                       (!server->transition))
-                                                       plugin_found = 1;
-                                       }
-
-                                       if (!plugin_found)
-                                       {
-                                               sprintf(string,
+                               PluginServer *server =
+                                       scan_plugindb(plugin->title, track->data_type);
+                               if( !server || server->transition ) {
+                                       sprintf(string,
        _("The %s '%s' in file '%s' is not part of your installation of Cinelerra.\n"
          "The project won't be rendered as it was meant and Cinelerra might crash.\n"),
-                                                       "effect", plugin->title,
-                                                       path);
-                                               MainError::show_error(string);
-                                       }
+                                               "effect", _(plugin->title), path);
+                                       MainError::show_error(string);
                                }
                        }
                }
 
-               for(Edit *edit = (Edit*)track->edits->first;
-                       edit;
-                       edit = (Edit*)edit->next)
-               {
-                       if (edit->transition)
-                       {
+               for( Edit *edit=track->edits->first; edit; edit=edit->next ) {
+                       if( !edit->transition ) continue;
 // ok we need to find transition in plugindb
-
-                               int transition_found = 0;
-                               for(int j = 0; j < plugindb->size(); j++)
-                               {
-                                       PluginServer *server = plugindb->get(j);
-                                       if(server->title &&
-                                               !strcasecmp(server->title, edit->transition->title) &&
-                                               ((track->data_type == TRACK_AUDIO && server->audio) ||
-                                               (track->data_type == TRACK_VIDEO && server->video)) &&
-                                               (server->transition))
-                                               transition_found = 1;
-                               }
-
-                               if (!transition_found)
-                               {
-                                       sprintf(string,
+                       PluginServer *server =
+                               scan_plugindb(edit->transition->title, track->data_type);
+                       if( !server || !server->transition ) {
+                               sprintf(string,
        _("The %s '%s' in file '%s' is not part of your installation of Cinelerra.\n"
          "The project won't be rendered as it was meant and Cinelerra might crash.\n"),
-                                               "transition", edit->transition->title,
-                                               path);
-                                       MainError::show_error(string);
-                               }
+                                       "transition", _(edit->transition->title), path);
+                               MainError::show_error(string);
                        }
                }
        }
index 12dac24fac63ff96cb299d3c6ee8875ef0510820..31c5be709d439ce210db37cf4291392a7536488a 100644 (file)
@@ -199,6 +199,7 @@ public:
 // Find the plugin whose title matches title and return it
        static PluginServer* scan_plugindb(char *title,
                int data_type);
+       static void fix_plugin_title(char *title);
        static int plugin_exists(const char *plugin_path, ArrayList<PluginServer*> &plugins);
        static int plugin_exists(char *plugin_path);
        void dump_plugindb(FILE *fp);
index e3c7e2ca7b424082c9230187f01bb2e33ff23eb3..f95f1e81d8d29562885dbf15ab499b4541073e04 100644 (file)
@@ -153,7 +153,7 @@ void PerformancePrefs::create_objects()
                1,
                0,  // Select compressors to be offered
                0,  // Prompt for recording options
-               0,  // If nonzero, prompt for insertion strategy
+               0,  // prompt for file_per_label
                1); // Supply file formats for background rendering
        x = xmargin1;
 
@@ -547,17 +547,14 @@ int PrefsRenderFarmPort::handle_event()
 
 PrefsRenderFarmNodes::PrefsRenderFarmNodes(PreferencesWindow *pwindow,
        PerformancePrefs *subwindow, int x, int y)
- : BC_ListBox(x, y, 340, 230,
-               LISTBOX_TEXT,                         // Display text list or icons
-               subwindow->nodes,
-               0, //default_titles,
-               0, //default_widths,
-               PerformancePrefs::TOTAL_COLUMNS)
+ : BC_ListBox(x, y, 340, 230, LISTBOX_TEXT)
 {
        for( int i=0; i<PerformancePrefs::TOTAL_COLUMNS; ++i ) {
                titles[i] = _(default_titles[i]);
                widths[i] = default_widths[i];
        }
+       update(subwindow->nodes, titles, widths, PerformancePrefs::TOTAL_COLUMNS,
+               0, 0, -1, 0, 0);
        this->subwindow = subwindow;
        this->pwindow = pwindow;
 }
index 479a14e5b9fe5eeb4d8913831f9f44e4de98d3b2..25023190bab85b6eb8dfcbb6e08a7189cc60e6a0 100644 (file)
@@ -37,9 +37,7 @@
 #include "virtualnode.h"
 
 
-Plugin::Plugin(EDL *edl,
-               Track *track,
-               const char *title)
+Plugin::Plugin(EDL *edl, Track *track, const char *title)
  : Edit(edl, track)
 {
        is_plugin = 1;
@@ -189,15 +187,10 @@ void Plugin::equivalent_output(Edit *edit, int64_t *result)
        }
 
 // Start of plugin changed
-       if(
-               startproject != plugin->startproject ||
-               plugin_type != plugin->plugin_type ||
-               on != plugin->on ||
-               !(shared_location == plugin->shared_location) ||
-               strcmp(title, plugin->title)
-               )
-       {
-               if(*result < 0 || startproject < *result)
+       if( startproject != plugin->startproject || plugin_type != plugin->plugin_type ||
+           on != plugin->on || !(shared_location == plugin->shared_location) ||
+               strcmp(title, plugin->title) ) {
+               if( *result < 0 || startproject < *result )
                        *result = startproject;
        }
 
@@ -546,20 +539,22 @@ Track* Plugin::get_shared_track()
 
 void Plugin::calculate_title(char *string, int use_nudge)
 {
-       if(plugin_type == PLUGIN_STANDALONE || plugin_type == PLUGIN_NONE)
-       {
+       switch( plugin_type ) {
+       case PLUGIN_STANDALONE:
+       case PLUGIN_NONE:
                strcpy(string, _(title));
+               break;
+       case PLUGIN_SHAREDPLUGIN:
+       case PLUGIN_SHAREDMODULE:
+               shared_location.calculate_title(string, edl,
+                       startproject, 0, plugin_type, use_nudge);
+               break;
        }
-       else
-       if(plugin_type == PLUGIN_SHAREDPLUGIN || plugin_type == PLUGIN_SHAREDMODULE)
-       {
-               shared_location.calculate_title(string,
-                       edl,
-                       startproject,
-                       0,
-                       plugin_type,
-                       use_nudge);
-       }
+}
+
+void Plugin::fix_plugin_title(char *title)
+{
+       MWindow::fix_plugin_title(title);
 }
 
 
@@ -585,11 +580,7 @@ void Plugin::shift(int64_t difference)
 void Plugin::dump(FILE *fp)
 {
        fprintf(fp,"    PLUGIN: type=%d title=\"%s\" on=%d track=%d plugin=%d\n",
-               plugin_type,
-               title,
-               on,
-               shared_location.module,
-               shared_location.plugin);
+               plugin_type, title, on, shared_location.module, shared_location.plugin);
        fprintf(fp,"    startproject %jd length %jd\n", startproject, length);
 
        keyframes->dump(fp);
index ef5d74887b12215e24113e736a0afe19e8604738..15aa75ced5799b34f26ffa99442088573e754efb 100644 (file)
@@ -108,6 +108,7 @@ public:
 // Shift in time
        void shift(int64_t difference);
        void dump(FILE *fp=stdout);
+       static void fix_plugin_title(char *title);
 // Called by PluginClient sequence to get rendering parameters
        KeyFrame* get_prev_keyframe(int64_t position, int direction);
        KeyFrame* get_next_keyframe(int64_t position, int direction);
index 7a9b9f559150a8a420dbd73262fb2d9dfec765a6..33a3ec158d7420338af735c0af12acd301e85630 100644 (file)
@@ -193,7 +193,7 @@ int PluginArray::run_plugins()
                MainProgressBar *progress;
                char string[BCTEXTLEN], string2[BCTEXTLEN];
 
-               sprintf(string, "%s...", plugin_server->title);
+               sprintf(string, "%s...", _(plugin_server->title));
                progress = mwindow->mainprogress->start_progress(string, end - start);
 
                for(int64_t current_position = start;
@@ -219,7 +219,7 @@ int PluginArray::run_plugins()
                progress->stop_progress();
                delete progress;
 
-               sprintf(string, _("%s took %s"), plugin_server->title, string2);
+               sprintf(string, _("%s took %s"), _(plugin_server->title), string2);
                mwindow->gui->lock_window();
                mwindow->gui->show_message(string2);
                mwindow->gui->unlock_window();
index 9fec465d3a1e1c6752a4b5b369ffc6e83df43bda..5ce006c00fc2dc1bbf87da3601935da78267cfa9 100644 (file)
@@ -243,25 +243,8 @@ PluginDialog::~PluginDialog()
 void PluginDialog::create_objects()
 {
 //     int use_default = 1;
-       char string[BCTEXTLEN];
        mwindow->theme->get_plugindialog_sizes();
-
        lock_window("PluginDialog::create_objects");
-       if(thread->plugin)
-       {
-               strcpy(string, thread->plugin->title);
-               //use_default = 0;
-       }
-       else
-       {
-// no plugin
-               sprintf(string, _("None"));
-       }
-
-
-
-
-
 
 // GET A LIST OF ALL THE PLUGINS AVAILABLE
        mwindow->search_plugindb(thread->data_type == TRACK_AUDIO,
@@ -288,10 +271,9 @@ void PluginDialog::create_objects()
                        PLAY_FORWARD,
                        1,
                        0);
-               char *plugin_title = plugin->title;
                char string[BCTEXTLEN];
-
-               snprintf(string, sizeof(string), "%s: %s", track_title, _(plugin_title));
+               const char *plugin_title = _(plugin->title);
+               snprintf(string, sizeof(string), "%s: %s", track_title, plugin_title);
                shared_data.append(new BC_ListBoxItem(string));
        }
        for(int i = 0; i < module_locations.total; i++)
@@ -330,12 +312,6 @@ void PluginDialog::create_objects()
 //                     mwindow->theme->plugindialog_newattach_y));
 //
 
-
-
-
-
-
-
        add_subwindow(shared_title = new BC_Title(mwindow->theme->plugindialog_shared_x,
                mwindow->theme->plugindialog_shared_y - 20,
                _("Shared effects:")));
@@ -357,13 +333,6 @@ void PluginDialog::create_objects()
 //                     mwindow->theme->plugindialog_sharedattach_y));
 //
 
-
-
-
-
-
-
-
        add_subwindow(module_title = new BC_Title(mwindow->theme->plugindialog_module_x,
                mwindow->theme->plugindialog_module_y - 20,
                _("Shared tracks:")));
index aff809f39da4768b205d655d37494ec15665f05d..8feb6ed612ce35dfab061837d629aafb19915125 100644 (file)
@@ -271,7 +271,7 @@ int PluginServer::get_synthesis()
 
 void PluginServer::set_title(const char *string)
 {
-       if(title) delete [] title;
+       delete [] title;
        title = cstrdup(string);
 }
 
index a99dc5d81f7d2381e9c635594bf9c74707240fb3..da8e8bd1aa7e3c481bf28a3cf6cb47a49863220b 100644 (file)
@@ -382,7 +382,7 @@ public:
        int uses_gui;
 // Plugin is a transition
        int transition;
-// name/tip of plugin in current locale.
+// name/tip of plugin
        char *title, *tip;
        int64_t written_samples, written_frames;
        char *path;           // location of plugin on disk
index 8061289ca871d4192ec482e5a16ea1b080a5e518..e46fbd326f256011a2365a08151e61543f8fd4f9 100644 (file)
@@ -400,6 +400,7 @@ void PluginSet::load(FileXML *file, uint32_t load_flags)
                                char title[BCTEXTLEN];
                                title[0] = 0;
                                file->tag.get_property("TITLE", title);
+                               Plugin::fix_plugin_title(title);
                                SharedLocation shared_location;
                                shared_location.load(file);
 
index 5851eb90995d279081e2e37d850703ab9ad3d0ac..8001973b9afcd7e4312df992539c843709e60ae7 100644 (file)
@@ -82,7 +82,7 @@ void RecordPrefs::create_objects()
                1,
                0,  // Select compressors to be offered
                1,  // Prompt for recording options
-               0,  // If nonzero, prompt for insertion strategy
+               0,  // prompt for file_per_label
                0); // Supply file formats for background rendering
 
        realtime_toc = new RecordRealtimeTOC(mwindow, pwindow,
index f50ae8958935d0bc96a5eb172122ba68355e0334..4363cd9e0ebb5c0713779e6994fc685fadb11bcb 100644 (file)
@@ -219,8 +219,8 @@ void MainPackageRenderer::set_progress(int64_t value)
 
        render->counter_lock->unlock();
 
-// This locks the preferences
-       if(mwindow) mwindow->preferences->copy_rates_from(preferences);
+       if( mwindow )
+               mwindow->preferences->copy_rates_from(preferences);
 }
 
 int MainPackageRenderer::progress_cancelled()
@@ -236,13 +236,13 @@ Render::Render(MWindow *mwindow)
        this->mwindow = mwindow;
        in_progress = 0;
        progress = 0;
-       preferences = 0;
        elapsed_time = 0.0;
        package_lock = new Mutex("Render::package_lock");
        counter_lock = new Mutex("Render::counter_lock");
        completion = new Condition(0, "Render::completion");
        progress_timer = new Timer;
        range_type = RANGE_BACKCOMPAT;
+       preferences = new Preferences();
        thread = new RenderThread(mwindow, this);
        render_window = 0;
        asset = 0;
@@ -306,14 +306,12 @@ void Render::start_batches(ArrayList<BatchRenderJob*> *jobs)
 }
 
 void Render::start_batches(ArrayList<BatchRenderJob*> *jobs,
-       BC_Hash *boot_defaults,
-       Preferences *preferences)
+       BC_Hash *boot_defaults, Preferences *batch_prefs)
 {
        mode = Render::BATCH;
        batch_cancelled = 0;
+       preferences->copy_from(batch_prefs);
        this->jobs = jobs;
-       this->preferences = new Preferences;
-       this->preferences->copy_from(preferences);
 
        completion->reset();
        thread->run();
@@ -473,25 +471,15 @@ int Render::check_asset(EDL *edl, Asset &asset)
        return 0;
 }
 
-int Render::fix_strategy(int strategy, int use_renderfarm)
+int Render::get_strategy(int use_renderfarm, int file_per_label)
 {
-       if(use_renderfarm)
-       {
-               if(strategy == FILE_PER_LABEL)
-                       strategy = FILE_PER_LABEL_FARM;
-               else
-               if(strategy == SINGLE_PASS)
-                       strategy = SINGLE_PASS_FARM;
-       }
-       else
-       {
-               if(strategy == FILE_PER_LABEL_FARM)
-                       strategy = FILE_PER_LABEL;
-               else
-               if(strategy == SINGLE_PASS_FARM)
-                       strategy = SINGLE_PASS;
-       }
-       return strategy;
+       return use_renderfarm ?
+               (file_per_label ? FILE_PER_LABEL_FARM : SINGLE_PASS_FARM) :
+               (file_per_label ? FILE_PER_LABEL      : SINGLE_PASS     ) ;
+}
+int Render::get_strategy()
+{
+       return get_strategy(preferences->use_renderfarm, file_per_label);
 }
 
 void Render::start_progress()
@@ -628,7 +616,7 @@ void Render::get_starting_number(char *path,
 
 int Render::load_defaults(Asset *asset)
 {
-       strategy = mwindow->defaults->get("RENDER_STRATEGY", SINGLE_PASS);
+       file_per_label = mwindow->defaults->get("RENDER_FILE_PER_LABEL", 0);
        load_mode = mwindow->defaults->get("RENDER_LOADMODE", LOADMODE_NEW_TRACKS);
        range_type = mwindow->defaults->get("RENDER_RANGE_TYPE", RANGE_PROJECT);
 
@@ -647,8 +635,8 @@ int Render::load_defaults(Asset *asset)
 int Render::load_profile(int profile_slot, Asset *asset)
 {
        char string_name[100];
-       sprintf(string_name, "RENDER_%i_STRATEGY", profile_slot);
-       strategy = mwindow->defaults->get(string_name, SINGLE_PASS);
+       sprintf(string_name, "RENDER_%i_FILE_PER_LABEL", profile_slot);
+       file_per_label = mwindow->defaults->get(string_name, 0);
 // Load mode is not part of the profile
 //     printf(string_name, "RENDER_%i_LOADMODE", profile_slot);
 //     load_mode = mwindow->defaults->get(string_name, LOADMODE_NEW_TRACKS);
@@ -664,7 +652,7 @@ int Render::load_profile(int profile_slot, Asset *asset)
 
 int Render::save_defaults(Asset *asset)
 {
-       mwindow->defaults->update("RENDER_STRATEGY", strategy);
+       mwindow->defaults->update("RENDER_FILE_PER_LABEL", file_per_label);
        mwindow->defaults->update("RENDER_LOADMODE", load_mode);
        mwindow->defaults->update("RENDER_RANGE_TYPE", range_type);
 
@@ -711,12 +699,6 @@ void RenderThread::render_single(int test_overwrite, Asset *asset, EDL *edl,
        render->progress = 0;
        render->result = 0;
 
-       if( mwindow ) {
-               if( !render->preferences )
-                       render->preferences = new Preferences;
-               render->preferences->copy_from(mwindow->preferences);
-       }
-
 // Create rendering command
        TransportCommand *command = new TransportCommand;
        command->command = NORMAL_FWD;
@@ -778,7 +760,6 @@ void RenderThread::render_single(int test_overwrite, Asset *asset, EDL *edl,
                if(mwindow) mwindow->stop_brender();
 
                fs.complete_path(render->default_asset->path);
-               strategy = Render::fix_strategy(strategy, render->preferences->use_renderfarm);
 
                render->result = render->packages->create_packages(mwindow,
                        command->get_edl(),
@@ -1029,10 +1010,13 @@ if(debug) printf("Render::render %d\n", __LINE__);
 
 void RenderThread::run()
 {
+       if( mwindow )
+               render->preferences->copy_from(mwindow->preferences);
+
        if(render->mode == Render::INTERACTIVE)
        {
                render_single(1, render->asset, mwindow->edl,
-                       render->strategy, render->range_type);
+                       render->get_strategy(), render->range_type);
        }
        else
        if(render->mode == Render::BATCH)
@@ -1070,9 +1054,8 @@ void RenderThread::run()
                                edl->create_objects();
                                file->read_from_file(job->edl_path);
                                edl->load_xml(file, LOAD_ALL);
-
 //PRINT_TRACE
-                               render_single(0, job->asset, edl, job->strategy, RANGE_BACKCOMPAT);
+                               render_single(0, job->asset, edl, job->get_strategy(), RANGE_BACKCOMPAT);
 
 //PRINT_TRACE
                                edl->Garbage::remove_user();
@@ -1151,7 +1134,7 @@ void RenderWindow::load_profile(int profile_slot)
 {
        render->load_profile(profile_slot, asset);
        update_range_type(render->range_type);
-       render_format->update(asset, &render->strategy);
+       render_format->update(asset, &render->file_per_label);
 }
 
 
@@ -1160,15 +1143,14 @@ void RenderWindow::create_objects()
        int x = 10, y = 10;
        lock_window("RenderWindow::create_objects");
        add_subwindow(new BC_Title(x, y,
-               (char*)((render->strategy == FILE_PER_LABEL ||
-                               render->strategy == FILE_PER_LABEL_FARM) ?
+               (char*)(render->file_per_label ?
                        _("Select the first file to render to:") :
                        _("Select a file to render to:"))));
        y += 25;
 
        render_format = new RenderFormat(mwindow, this, asset);
        render_format->create_objects(x, y,
-               1, 1, 1, 1, 0, 1, 0, 0, &render->strategy, 0);
+               1, 1, 1, 1, 0, 1, 0, 0, &render->file_per_label, 0);
 
        BC_Title *title;
        add_subwindow(title = new BC_Title(x, y, _("Render range:")));
index 6faf558903f8b8e46b62545383070d49a73c2211..1e025abcd95c078a2aebccc28961b36c7c7db44a 100644 (file)
@@ -112,8 +112,7 @@ public:
        void start_batches(ArrayList<BatchRenderJob*> *jobs);
 // The batches are processed in the foreground in non interactive mode.
        void start_batches(ArrayList<BatchRenderJob*> *jobs,
-               BC_Hash *boot_defaults,
-               Preferences *preferences);
+               BC_Hash *boot_defaults, Preferences *batch_prefs);
 // Called by BatchRender to stop the operation.
        void stop_operation();
        BC_Window* new_gui();
@@ -129,8 +128,9 @@ public:
 // force asset parameters regardless of window
 // This should be integrated into the Asset Class.
        static int check_asset(EDL *edl, Asset &asset);
-// Fix strategy to conform with using renderfarm.
-       static int fix_strategy(int strategy, int use_renderfarm);
+// strategy to conform with using renderfarm.
+       static int get_strategy(int use_renderfarm, int file_per_label);
+       int get_strategy();
 // Force filename to have a 0 padded number if rendering to a list.
        int check_numbering(Asset &asset);
        static void create_filename(char *path,
@@ -169,7 +169,6 @@ public:
 // Background compression must be disabled when direct frame copying and reenabled afterwards
        int direct_frame_copying;
 
-// Copy of mwindow preferences or pointer to another preferences object
        Preferences *preferences;
        VFrame *compressed_output;
        MainProgressBar *progress;
@@ -179,7 +178,7 @@ public:
        PlayableTracks *playable_tracks;
        PackageDispatcher *packages;
        Mutex *package_lock, *counter_lock;
-       int strategy;
+       int file_per_label;
        int range_type;
 // Total selection to render in seconds
        double total_start, total_end;
index 3f2cb74b614912c794863b337585d76debf8e971..3e7eeb1bb81c42aa48a03a6e42110ca0aa7def28 100644 (file)
@@ -218,8 +218,9 @@ int RenderProfile::save_to_slot(int profile_slot, const char *profile_name)
        sprintf(string_name, "RENDER_%i_PROFILE_NAME", profile_slot);
        mwindow->defaults->update(string_name, profile_name);
 
-       sprintf(string_name, "RENDER_%i_STRATEGY", profile_slot);
-       mwindow->defaults->update(string_name, rwindow->render->strategy);
+       sprintf(string_name, "RENDER_%i_FILE_PER_LABEL", profile_slot);
+       mwindow->defaults->update(string_name,
+               rwindow->render->file_per_label ? FILE_PER_LABEL : SINGLE_PASS);
        sprintf(string_name, "RENDER_%i_LOADMODE", profile_slot);
        mwindow->defaults->update(string_name, rwindow->render->load_mode);
        sprintf(string_name, "RENDER_%i_RANGE_TYPE", profile_slot);
index 1a3706fa7b9d3462c4f8d407175799ea5e5d9b37..7a4323bd7e1343cdf8f6b5c67d2953273625a2ed 100644 (file)
@@ -271,7 +271,7 @@ int VRender::get_colormodel(VEdit *playable_edit, int use_vconsole, int use_bren
                                        colormodel = BC_BGR8888;
                                else {
 // file favorite colormodel may mismatch rgb/yuv
-                                       int vstream = playable_edit->channel;
+                                       int vstream = playable_edit ? playable_edit->channel : -1;
                                        int best_colormodel = file->get_best_colormodel(vconfig->driver, vstream);
                                        if( BC_CModels::is_yuv(best_colormodel) == BC_CModels::is_yuv(colormodel) )
                                                colormodel = best_colormodel;
index 24bfa698b9643a44b94e182b3da755d17b09daa7..1f83f499be3f8fc1366df43a9ef45b40f70f5a02 100644 (file)
@@ -155,7 +155,7 @@ _1080to480Main::~_1080to480Main()
        if(temp) delete temp;
 }
 
-const char* _1080to480Main::plugin_title() { return _("1080 to 480"); }
+const char* _1080to480Main::plugin_title() { return N_("1080 to 480"); }
 int _1080to480Main::is_realtime() { return 1; }
 
 NEW_WINDOW_MACRO(_1080to480Main, _1080to480Window)
index 8e44c87cc44ce5d6bc648731b03994e85b6ad98b..64bbbb53d9eb984d67eba6f8a306b504c9533f46 100644 (file)
@@ -159,7 +159,7 @@ _1080to540Main::~_1080to540Main()
        if(temp) delete temp;
 }
 
-const char* _1080to540Main::plugin_title() { return _("1080 to 540"); }
+const char* _1080to540Main::plugin_title() { return N_("1080 to 540"); }
 int _1080to540Main::is_realtime() { return 1; }
 
 NEW_WINDOW_MACRO(_1080to540Main, _1080to540Window)
index e0b5d2161e6c159e512b17bcee57a4298508d6d8..fda3e1d016bd6acba29f72ccb146b9b06495492c 100644 (file)
@@ -189,7 +189,7 @@ _720to480Main::~_720to480Main()
        if(temp) delete temp;
 }
 
-const char* _720to480Main::plugin_title() { return _("720 to 480"); }
+const char* _720to480Main::plugin_title() { return N_("720 to 480"); }
 int _720to480Main::is_realtime() { return 0; }
 
 double _720to480Main::get_framerate()
index 6006e07b0060fb634731c21b55296f67a0b858e4..f4f372b187051f0cb9af78a886fffc6ca81373e5 100644 (file)
@@ -214,7 +214,7 @@ int C41Slider::update(int v)
        return 1;
 }
 
-const char* C41Effect::plugin_title() { return _("C41"); }
+const char* C41Effect::plugin_title() { return N_("C41"); }
 int C41Effect::is_realtime() { return 1; }
 int C41Effect::is_synthesis() { return 1; }
 
index dc51d4c1747677bbd34dd106e0ca334b2333b206..765a8fcd2e60261ff013b83650ab1365eb7c9964 100644 (file)
@@ -73,7 +73,7 @@ AgingMain::~AgingMain()
        if(aging_server) delete aging_server;
 }
 
-const char* AgingMain::plugin_title() { return _("AgingTV"); }
+const char* AgingMain::plugin_title() { return N_("AgingTV"); }
 int AgingMain::is_realtime() { return 1; }
 
 NEW_WINDOW_MACRO(AgingMain, AgingWindow)
index 129748d5022578ff079500af575ec4ec85995756..3726237bc9973bd32d87c78152e7c62a68ec2c64 100644 (file)
@@ -661,7 +661,7 @@ void AudioScope::reset()
 }
 
 
-const char* AudioScope::plugin_title() { return _("AudioScope"); }
+const char* AudioScope::plugin_title() { return N_("AudioScope"); }
 int AudioScope::is_realtime() { return 1; }
 int AudioScope::is_multichannel() { return 1; }
 
index 5f7015eb6a543965eab88f96edf387bafe84b04c..e808f5edba380ebb16db1aff1be7a141db3c1db2 100644 (file)
@@ -181,7 +181,7 @@ BandSlideMain::~BandSlideMain()
 
 }
 
-const char* BandSlideMain::plugin_title() { return _("BandSlide"); }
+const char* BandSlideMain::plugin_title() { return N_("BandSlide"); }
 int BandSlideMain::is_transition() { return 1; }
 int BandSlideMain::uses_gui() { return 1; }
 
index 4c9de91e3e4bd628eda0c7d778d954032315c74f..e707b4874c181c3e7169b966bf56273a7a220217 100644 (file)
@@ -178,7 +178,7 @@ BandWipeMain::~BandWipeMain()
 
 }
 
-const char* BandWipeMain::plugin_title() { return _("BandWipe"); }
+const char* BandWipeMain::plugin_title() { return N_("BandWipe"); }
 int BandWipeMain::is_transition() { return 1; }
 int BandWipeMain::uses_gui() { return 1; }
 
index 5e7b41038d68df86ea348399e9039b3857dc20e4..fab60bbfe8dae14c90b3de4b1a0dcdd87ba483b4 100644 (file)
@@ -84,7 +84,7 @@ BluebananaMain::~BluebananaMain() {
   delete engine;
 }
 
-const char* BluebananaMain::plugin_title() { return _("Blue Banana"); }
+const char* BluebananaMain::plugin_title() { return N_("Blue Banana"); }
 int BluebananaMain::is_realtime() { return 1; }
 
 NEW_WINDOW_MACRO(BluebananaMain, BluebananaWindow)
index ab9a5be237bcc69f258cfbdbbd05c19eff281b33..c357f943ee4877b62d1188aed2e99761c55c89c8 100644 (file)
@@ -128,7 +128,7 @@ BlurMain::~BlurMain()
        if(overlayer) delete overlayer;
 }
 
-const char* BlurMain::plugin_title() { return _("Blur"); }
+const char* BlurMain::plugin_title() { return N_("Blur"); }
 int BlurMain::is_realtime() { return 1; }
 
 
index 2f2d3726b4453c06b71b45219cceec3347c3056a..098d5f6ca7bd314906f27162ffd8ababbbb44a19 100644 (file)
@@ -60,7 +60,7 @@ BlurZoomMain::~BlurZoomMain()
 {
 }
 
-char* BlurZoomMain::plugin_title() { return _("RadioacTV"); }
+char* BlurZoomMain::plugin_title() { return N_("RadioacTV"); }
 int BlurZoomMain::is_realtime() { return 1; }
 
 NEW_WINDOW_MACRO(BlurZoomMain, BlurZoomWindow)
index 9eaf9a3004579dbafa52b822d90dc480ebe6b491..31fc23d6cfdef599338dda64f0749412eef65dce 100644 (file)
@@ -93,7 +93,7 @@ BrightnessMain::~BrightnessMain()
        if(engine) delete engine;
 }
 
-const char* BrightnessMain::plugin_title() { return _("Brightness/Contrast"); }
+const char* BrightnessMain::plugin_title() { return N_("Brightness/Contrast"); }
 int BrightnessMain::is_realtime() { return 1; }
 
 NEW_WINDOW_MACRO(BrightnessMain, BrightnessWindow)
index f7a7d586e3c6609624729d7dfda807f86ae89b25..cbf9939e96f3d900471b8699977097fbe1038a14 100644 (file)
@@ -73,7 +73,7 @@ BurnMain::~BurnMain()
        if(effecttv) delete effecttv;
 }
 
-const char* BurnMain::plugin_title() { return _("BurningTV"); }
+const char* BurnMain::plugin_title() { return N_("BurningTV"); }
 int BurnMain::is_realtime() { return 1; }
 
 
index 2744ce44c9a108a0ded2c972f4efc1f777a35f56..f124446626763d0b63729c2d9ac3d00316e6f3d6 100644 (file)
@@ -51,7 +51,7 @@ CDRipMain::~CDRipMain()
 {
 }
 
-const char* CDRipMain::plugin_title() { return _("CD Ripper"); }
+const char* CDRipMain::plugin_title() { return N_("CD Ripper"); }
 int CDRipMain::is_realtime() { return 0; }
 int CDRipMain::is_multichannel() { return 1; }
 
index fe52fec66e0601302ada2b326646100ddab20857..ef546b294c83bc3217ae812267e520432525a494 100644 (file)
@@ -596,7 +596,7 @@ SET_TRACE
        return 1;
 }
 
-const char* ChromaKey::plugin_title() { return _("Chroma key"); }
+const char* ChromaKey::plugin_title() { return N_("Chroma key"); }
 int ChromaKey::is_realtime() { return 1; }
 
 NEW_WINDOW_MACRO(ChromaKey, ChromaKeyWindow)
index b96b172a4707aeb92819ab080b2359f3100ec341..154e28489cf9330f3eee962efad6e63d3dfa9965 100644 (file)
@@ -925,7 +925,7 @@ int ChromaKeyHSV::process_buffer(VFrame *frame,
        return 0;
 }
 
-const char* ChromaKeyHSV::plugin_title() { return _("Chroma key (HSV)"); }
+const char* ChromaKeyHSV::plugin_title() { return N_("Chroma key (HSV)"); }
 int ChromaKeyHSV::is_realtime() { return 1; }
 
 
index 8cc288ee72c6ee168808d5caf5329cea3d07117e..ba1f0094fcc924c36019573138d4ff46d26f4791 100644 (file)
@@ -360,7 +360,7 @@ Color3WayMain::~Color3WayMain()
        delete engine;
 }
 
-const char* Color3WayMain::plugin_title() { return _("Color 3 Way"); }
+const char* Color3WayMain::plugin_title() { return N_("Color 3 Way"); }
 int Color3WayMain::is_realtime() { return 1; }
 
 
index 16d26ef9fdb0bb96e814b476371d44c17d025e5e..c180a720bd289ff146fd279027f38e2a931303d3 100644 (file)
@@ -336,7 +336,7 @@ ColorBalanceMain::~ColorBalanceMain()
        }
 }
 
-const char* ColorBalanceMain::plugin_title() { return _("Color Balance"); }
+const char* ColorBalanceMain::plugin_title() { return N_("Color Balance"); }
 int ColorBalanceMain::is_realtime() { return 1; }
 
 
index 54405a4c819ea70c468c04e95f6001b99561a025..f25a59ece7a6c3a9dcebfd769c7cb96df7e370c6 100644 (file)
@@ -114,7 +114,7 @@ void CompressorEffect::reset()
        current_value = 1.0;
 }
 
-const char* CompressorEffect::plugin_title() { return _("Compressor"); }
+const char* CompressorEffect::plugin_title() { return N_("Compressor"); }
 int CompressorEffect::is_realtime() { return 1; }
 int CompressorEffect::is_multichannel() { return 1; }
 
index 6c110c43a1361c7d9c6d688ac727c51ab3a2ad09..9ed221a5c6c36ca55d2f3df6c8330f88eff1a54d 100644 (file)
@@ -299,7 +299,7 @@ void CriKey::get_color(int x, int y)
        }
 }
 
-const char* CriKey::plugin_title() { return _("CriKey"); }
+const char* CriKey::plugin_title() { return N_("CriKey"); }
 int CriKey::is_realtime() { return 1; }
 
 NEW_WINDOW_MACRO(CriKey, CriKeyWindow);
index 174053d979a3c24878a62a042a72002c408c50d1..76b1fac23d3f2f2fc46cc76a5f3ab898b0c17d1f 100644 (file)
@@ -43,7 +43,7 @@ CrossfadeMain::~CrossfadeMain()
 {
 }
 
-const char* CrossfadeMain::plugin_title() { return _("Crossfade"); }
+const char* CrossfadeMain::plugin_title() { return N_("Crossfade"); }
 int CrossfadeMain::is_transition() { return 1; }
 int CrossfadeMain::uses_gui() { return 0; }
 
index e4a6d5e23ee5766e0c36aebbb2ccc0efcc1e9410..97a219425f0a3d1dcc72643d8520316e0bcc3f4e 100644 (file)
@@ -124,7 +124,7 @@ public:
        DBXEffect(PluginServer *server);
        ~DBXEffect();
 
-       char* plugin_title();
+       const char* plugin_title();
        int is_multichannel();
        int is_realtime();
        void read_data(KeyFrame *keyframe);
index cf1e2a494732793fb53922886043230e04e02c63..9fca5cc7a74dfb8b6ced2f64c4702cc379e0a608 100644 (file)
@@ -56,7 +56,7 @@ DCOffset::~DCOffset()
        delete reference;
 }
 
-const char* DCOffset::plugin_title() { return _("DC Offset"); }
+const char* DCOffset::plugin_title() { return N_("DC Offset"); }
 int DCOffset::is_realtime() { return 1; }
 
 
index f2d4d6bb35d6a74ad73cc1c2a9143b56aa709254..75b0d1e58262dcbe8a2995bd52c54c75b8dc3e30 100644 (file)
@@ -739,7 +739,7 @@ int Decimate::process_buffer(VFrame *frame,
 
 
 
-const char* Decimate::plugin_title() { return _("Decimate"); }
+const char* Decimate::plugin_title() { return N_("Decimate"); }
 int Decimate::is_realtime() { return 1; }
 
 NEW_WINDOW_MACRO(Decimate, DecimateWindow)
index b7cc0dc12e298a2e54d92a252fa31660b4fcd364..50a8ad33b7f448183d0bfbc24473c980fa80091d 100644 (file)
@@ -94,7 +94,7 @@ DeInterlaceMain::~DeInterlaceMain()
        if(temp_prevframe) delete temp_prevframe;
 }
 
-const char* DeInterlaceMain::plugin_title() { return _("Deinterlace-CV"); }
+const char* DeInterlaceMain::plugin_title() { return N_("Deinterlace-CV"); }
 int DeInterlaceMain::is_realtime() { return 1; }
 
 
index 028d90db865d7e202d1c9ffa90ddf8a46a4a97a3..27a5c5959758a0d82478c33a95ed5a6a51e26e5b 100644 (file)
@@ -81,7 +81,7 @@ DeInterlaceMain::~DeInterlaceMain()
 //     if(temp) delete temp;
 }
 
-const char* DeInterlaceMain::plugin_title() { return _("Deinterlace"); }
+const char* DeInterlaceMain::plugin_title() { return N_("Deinterlace"); }
 int DeInterlaceMain::is_realtime() { return 1; }
 
 
index 3db63e88005b8e784b5ea5b04a9300cd14ffd809..e67b88409583365fd084b7ef6dcdf989ae1e3ff6 100644 (file)
@@ -55,7 +55,7 @@ DelayAudio::~DelayAudio()
 
 NEW_WINDOW_MACRO(DelayAudio, DelayAudioWindow)
 
-const char* DelayAudio::plugin_title() { return _("Delay audio"); }
+const char* DelayAudio::plugin_title() { return N_("Delay audio"); }
 int DelayAudio::is_realtime() { return 1; }
 
 
index 55ea5d4e0915a7aadbab2a1129bbd7290d6ca062..8047666ea162a82452de926702a2db204629ea0e 100644 (file)
@@ -246,7 +246,7 @@ int DelayVideo::is_realtime()
        return 1;
 }
 
-const char* DelayVideo::plugin_title() { return _("Delay Video"); }
+const char* DelayVideo::plugin_title() { return N_("Delay Video"); }
 
 LOAD_CONFIGURATION_MACRO(DelayVideo, DelayVideoConfig)
 NEW_WINDOW_MACRO(DelayVideo, DelayVideoWindow)
index 475f3952322b0c09ec8f15b91dad35d8b910c436..e785e5e9723596fe6572436e94ec7e594896e40b 100644 (file)
@@ -126,7 +126,7 @@ void DenoiseEffect::reset()
        iterations = 1;
 }
 
-const char* DenoiseEffect::plugin_title() { return _("Denoise"); }
+const char* DenoiseEffect::plugin_title() { return N_("Denoise"); }
 int DenoiseEffect::is_realtime() { return 1; }
 
 
index 57fec35630678efe695f6803f780720a30e4982c..c9603689bfa24b8dcdce0003a8a322c27c6827d7 100644 (file)
@@ -308,7 +308,7 @@ void DenoiseFFTEffect::reset()
 }
 
 int DenoiseFFTEffect::is_realtime() { return 1; }
-const char* DenoiseFFTEffect::plugin_title() { return _("DenoiseFFT"); }
+const char* DenoiseFFTEffect::plugin_title() { return N_("DenoiseFFT"); }
 
 
 
index 4e058fefcefcb59d09a4913422768978321c0210..1fd3381a227228c6d9f10c7ee58093f9e3608f54 100644 (file)
@@ -444,7 +444,7 @@ int DenoiseMJPEG::process_realtime(VFrame *input, VFrame *output)
        return 0;
 }
 
-const char* DenoiseMJPEG::plugin_title() { return _("Denoise video2"); }
+const char* DenoiseMJPEG::plugin_title() { return N_("Denoise video2"); }
 int DenoiseMJPEG::is_realtime() { return 1; }
 
 void DenoiseMJPEG::update_gui()
index b573898117088c72b4468628442f3a3be60aee93..743e7423870e99fd49a4f0b42bdea58f3421f459 100644 (file)
@@ -117,7 +117,7 @@ SelTempAvgMain::~SelTempAvgMain()
        if(history_valid) delete [] history_valid;
 }
 
-const char* SelTempAvgMain::plugin_title() { return _("Selective Temporal Averaging"); }
+const char* SelTempAvgMain::plugin_title() { return N_("Selective Temporal Averaging"); }
 int SelTempAvgMain::is_realtime() { return 1; }
 
 
index ad6a340d5ae6b3af0f1efa8bd67be573a4927bf8..12563624a7dc0f3da6ba24eb5db0a6f214691188 100644 (file)
@@ -411,7 +411,7 @@ int DenoiseVideo::process_realtime(VFrame *input, VFrame *output)
 }
 
 
-const char* DenoiseVideo::plugin_title() { return _("Denoise video"); }
+const char* DenoiseVideo::plugin_title() { return N_("Denoise video"); }
 int DenoiseVideo::is_realtime() { return 1; }
 
 
index ca8b96ac0fa2ad29f56603fff0e021009b44394c..ad636f12e5c7c65e097f8d90f3264f369f004d72 100644 (file)
@@ -51,7 +51,7 @@ Despike::~Despike()
 
 }
 
-const char* Despike::plugin_title() { return _("Despike"); }
+const char* Despike::plugin_title() { return N_("Despike"); }
 int Despike::is_realtime() { return 1; }
 
 NEW_WINDOW_MACRO(Despike, DespikeWindow)
index 2f24a58783bd6ea2190f3eee7bef17cc5a346b2e..ff8502f0cb8d3a4ad9c5caa386e8dd7d53e96988 100644 (file)
@@ -327,7 +327,7 @@ DiffKey::~DiffKey()
 NEW_WINDOW_MACRO(DiffKey, DiffKeyGUI)
 LOAD_CONFIGURATION_MACRO(DiffKey, DiffKeyConfig)
 
-const char* DiffKey::plugin_title() { return _("Difference key"); }
+const char* DiffKey::plugin_title() { return N_("Difference key"); }
 int DiffKey::is_realtime() { return 1; }
 int DiffKey::is_multichannel() { return 1; }
 
index 6c04fa07a8081acd6fb89cc83609a4acc4f1ec3c..37b5ac8c742d07139f0163bd773ec44182ba0740 100644 (file)
@@ -47,7 +47,7 @@ DissolveMain::~DissolveMain()
        delete overlayer;
 }
 
-const char* DissolveMain::plugin_title() { return _("Dissolve"); }
+const char* DissolveMain::plugin_title() { return N_("Dissolve"); }
 int DissolveMain::is_video() { return 1; }
 int DissolveMain::is_transition() { return 1; }
 int DissolveMain::uses_gui() { return 0; }
index 5060efd21e37be5bb790b5397d92ae47927fb555..daf17d3df7cb4dfbd8525d3d995aad085f0b4376 100644 (file)
@@ -79,7 +79,7 @@ DotMain::~DotMain()
        }
 }
 
-const char* DotMain::plugin_title() { return _("DotTV"); }
+const char* DotMain::plugin_title() { return N_("DotTV"); }
 int DotMain::is_realtime() { return 1; }
 
 NEW_WINDOW_MACRO(DotMain, DotWindow)
index 49e1489b35ef512abe80e8fe2466b147b5b5ef5e..a63bc5a7926f40ef46b705e3b28112bb68b65f86 100644 (file)
@@ -373,7 +373,7 @@ DownSampleMain::~DownSampleMain()
        if(engine) delete engine;
 }
 
-const char* DownSampleMain::plugin_title() { return _("Downsample"); }
+const char* DownSampleMain::plugin_title() { return N_("Downsample"); }
 int DownSampleMain::is_realtime() { return 1; }
 
 
index d8b426d06d85a8fe250db210c3cc068028c8062f..99ae7959fe8ce5acdbbb185c1d59d45f9258ff33 100644 (file)
@@ -207,7 +207,7 @@ void Echo::reset()
        bfr_pos = 0;
 }
 
-const char* Echo::plugin_title() { return _("Echo"); }
+const char* Echo::plugin_title() { return N_("Echo"); }
 int Echo::is_realtime() { return 1; }
 int Echo::is_multichannel() { return 1; }
 
index b0cf73dd9365d4464beb8d63da822bbee09e48c4..f1ff269ed6cc2881777e27a8ef8abb229f6554f7 100644 (file)
@@ -720,7 +720,7 @@ remove(int len)
                sample_data -= len;
 }
 
-const char* EchoCancel::plugin_title() { return _("EchoCancel"); }
+const char* EchoCancel::plugin_title() { return N_("EchoCancel"); }
 int EchoCancel::is_realtime() { return 1; }
 
 static inline double sqr(double v) { return v*v; }
index b8541927ee10399efa1fac46218ec1efd429fbd6..24c95dd4cc8004a1ba2cb13f60a4c0ff4f600882 100644 (file)
@@ -71,7 +71,7 @@ Edge::~Edge()
        delete dst;
 }
 
-const char* Edge::plugin_title() { return _("Edge"); }
+const char* Edge::plugin_title() { return N_("Edge"); }
 int Edge::is_realtime() { return 1; }
 
 NEW_WINDOW_MACRO(Edge, EdgeWindow);
index 0a39eb1b0dc1e8ed710b1ed30f3c582e42139dce..253e2a3c2f6ef6bdbb43cb173be7440923446029 100644 (file)
@@ -332,7 +332,7 @@ FieldFrame::~FieldFrame()
        if(input) delete input;
 }
 
-const char* FieldFrame::plugin_title() { return _("Fields to frames"); }
+const char* FieldFrame::plugin_title() { return N_("Fields to frames"); }
 int FieldFrame::is_realtime() { return 1; }
 
 
index 737167e5c48aab20fd527e45301ecb98b5ac268c..86235f2d19bed0fe22013dc101850849374ab070 100644 (file)
@@ -145,7 +145,7 @@ FindObjMain::~FindObjMain()
        delete overlayer;
 }
 
-const char* FindObjMain::plugin_title() { return _("FindObj"); }
+const char* FindObjMain::plugin_title() { return N_("FindObj"); }
 int FindObjMain::is_realtime() { return 1; }
 int FindObjMain::is_multichannel() { return 1; }
 
index e66f396263919ecb2e613cde85319a59a06cc62c..599ef395c8c6d555ca5c939c9433a418da24cf2b 100644 (file)
@@ -42,7 +42,7 @@ FlashMain::~FlashMain()
 {
 }
 
-const char* FlashMain::plugin_title() { return _("Flash"); }
+const char* FlashMain::plugin_title() { return N_("Flash"); }
 int FlashMain::is_video() { return 1; }
 int FlashMain::is_transition() { return 1; }
 int FlashMain::uses_gui() { return 0; }
index 81cd75325f1bdbfaed05a2ca15c9f3a93cdcadbb..5d866620b1dc69f93ba6296b1f1ddadb55f6caa4 100644 (file)
@@ -85,7 +85,7 @@ FlipMain::~FlipMain()
 
 }
 
-const char* FlipMain::plugin_title() { return _("Flip"); }
+const char* FlipMain::plugin_title() { return N_("Flip"); }
 int FlipMain::is_realtime() { return 1; }
 
 
index f4ff5487926314b6e00fe4249861228ed76a34a4..b29d3f03818c77772dcd4c97161e98c0a90d1e4d 100644 (file)
@@ -559,7 +559,7 @@ void FrameField::average_rows(int offset, VFrame *frame)
 
 
 
-const char* FrameField::plugin_title() { return _("Frames to fields"); }
+const char* FrameField::plugin_title() { return N_("Frames to fields"); }
 int FrameField::is_realtime() { return 1; }
 
 NEW_WINDOW_MACRO(FrameField, FrameFieldWindow)
index cc5bd37802419a37dbe723194bb164b6c9513147..64db30480f734d0d062c6b091081604a0b84a849 100644 (file)
@@ -456,7 +456,7 @@ FreeverbEffect::~FreeverbEffect()
 NEW_WINDOW_MACRO(FreeverbEffect, FreeverbWindow)
 
 
-const char* FreeverbEffect::plugin_title() { return _("Freeverb"); }
+const char* FreeverbEffect::plugin_title() { return N_("Freeverb"); }
 int FreeverbEffect::is_realtime() { return 1; }
 int FreeverbEffect::is_multichannel() { return 1; }
 
index 67904ed698ab7c3f233258c98255aa125fbda7f5..b873b22f89365914d352fb34963828f355183607 100644 (file)
@@ -154,7 +154,7 @@ FreezeFrameMain::~FreezeFrameMain()
        if(first_frame) delete first_frame;
 }
 
-const char* FreezeFrameMain::plugin_title() { return _("Freeze Frame"); }
+const char* FreezeFrameMain::plugin_title() { return N_("Freeze Frame"); }
 int FreezeFrameMain::is_synthesis() { return 1; }
 int FreezeFrameMain::is_realtime() { return 1; }
 
index 75c431a3b5f79a0a7fdbeb907ef092e4f407c83a..111c7f800385f33eca3e0526bb21b21410dc549f 100644 (file)
@@ -82,7 +82,7 @@ Gain::~Gain()
 
 }
 
-const char* Gain::plugin_title() { return _("Gain"); }
+const char* Gain::plugin_title() { return N_("Gain"); }
 int Gain::is_realtime() { return 1; }
 
 
index a462b0624930e3854bf5be71055b357bc1fee149..32312105992fee023a02aeb3bf12dc72b4b76778 100644 (file)
@@ -398,7 +398,7 @@ GammaMain::~GammaMain()
        delete engine;
 }
 
-const char* GammaMain::plugin_title() { return _("Gamma"); }
+const char* GammaMain::plugin_title() { return N_("Gamma"); }
 int GammaMain::is_realtime() { return 1; }
 
 
index 2378aec93a3562008108cd2e0848ad53cb42e607..1c4a956651181ce79875d307c707c25bdf457bd6 100644 (file)
@@ -657,7 +657,7 @@ GradientMain::~GradientMain()
        if(overlayer) delete overlayer;
 }
 
-const char* GradientMain::plugin_title() { return _("Gradient"); }
+const char* GradientMain::plugin_title() { return N_("Gradient"); }
 int GradientMain::is_realtime() { return 1; }
 
 
index f927679cd23673d6d79d102619f405a59d557a2e..e64d9c6991bcb85aa93424bcb0b75f89a6e99788 100644 (file)
@@ -1045,7 +1045,7 @@ GraphicEQ::~GraphicEQ()
 
 int GraphicEQ::is_realtime() { return 1; }
 
-const char* GraphicEQ::plugin_title() { return _("EQ Graphic"); }
+const char* GraphicEQ::plugin_title() { return N_("EQ Graphic"); }
 
 NEW_WINDOW_MACRO(GraphicEQ, GraphicGUI)
 
index 6b65ac72ee0d561726e69f44c3ba0df10a786bd1..c2029ca34f5e390cbcc722c4ebb30d6099131c1d 100644 (file)
@@ -93,7 +93,7 @@ GreyCStorationMain::~GreyCStorationMain()
        delete [] alpha;
 }
 
-const char* GreyCStorationMain::plugin_title() { return _("GreyCStoration"); }
+const char* GreyCStorationMain::plugin_title() { return N_("GreyCStoration"); }
 int GreyCStorationMain::is_realtime() { return 1; }
 
 
index a4f647cdd43e7b8226dbeb41ea1ebb87353dff53..d24b201831dd986b04a2f876393d9585af0b8338 100644 (file)
@@ -294,7 +294,7 @@ HistEqMain::~HistEqMain()
        delete [] wts;
 }
 
-const char* HistEqMain::plugin_title() { return _("HistEq"); }
+const char* HistEqMain::plugin_title() { return N_("HistEq"); }
 int HistEqMain::is_realtime() { return 1; }
 
 
index 183d5c0e7e3df7c2dbf1d35695b24b1e26de40d3..33c7b21d62dfc0ad433ff6761befa077be34e686 100644 (file)
@@ -96,7 +96,7 @@ HistogramMain::~HistogramMain()
        delete engine;
 }
 
-const char* HistogramMain::plugin_title() { return _("Histogram"); }
+const char* HistogramMain::plugin_title() { return N_("Histogram"); }
 int HistogramMain::is_realtime() { return 1; }
 
 
index 7c096cbeb81c0f11e020e1f5a8995886b2da209f..584a5e6f4d7e6c506bf971b1e9a079dcded3df2d 100644 (file)
@@ -78,7 +78,7 @@ HistogramMain::~HistogramMain()
        delete engine;
 }
 
-const char* HistogramMain::plugin_title() { return _("Histogram Bezier"); }
+const char* HistogramMain::plugin_title() { return N_("Histogram Bezier"); }
 int HistogramMain::is_realtime() { return 1; }
 
 
index 717f0f362be7df2c2f941c571a478dc1c7d9170e..083e5174f2cad959f5b088a1295de5569c0bcb28 100644 (file)
@@ -73,7 +73,7 @@ HoloMain::~HoloMain()
                delete bgimage;
 }
 
-const char* HoloMain::plugin_title() { return _("HolographicTV"); }
+const char* HoloMain::plugin_title() { return N_("HolographicTV"); }
 int HoloMain::is_realtime() { return 1; }
 
 NEW_WINDOW_MACRO(HoloMain, HoloWindow)
index db76fa230cac88d6127bd6d35c43fe67be7e9cd4..5800928e08be79e7830a70a4edbcaa7c834c2fd6 100644 (file)
@@ -568,7 +568,7 @@ int HueEffect::process_buffer(VFrame *frame,
        return 0;
 }
 
-const char* HueEffect::plugin_title() { return _("Hue saturation"); }
+const char* HueEffect::plugin_title() { return N_("Hue saturation"); }
 int HueEffect::is_realtime() { return 1; }
 
 NEW_WINDOW_MACRO(HueEffect, HueWindow)
index 84f1bfc6ddc37c2514a1c407abdb5d6e491ae80d..e7133ab1122307565a1e87c9e06138e656f5450b 100644 (file)
@@ -167,7 +167,7 @@ InterpolatePixelsMain::~InterpolatePixelsMain()
        delete engine;
 }
 
-const char* InterpolatePixelsMain::plugin_title() { return _("Interpolate Bayer"); }
+const char* InterpolatePixelsMain::plugin_title() { return N_("Interpolate Bayer"); }
 int InterpolatePixelsMain::is_realtime() { return 1; }
 
 
index d52e8bdb106dc6dac2792010273b1a467724f269..79124bbc690b384ab5adcf5fd98fc2286dcfecd6 100644 (file)
@@ -44,7 +44,7 @@ public:
        InterpolateAllEffect(PluginServer *server);
        ~InterpolateAllEffect();
 
-       char* plugin_title();
+       const char* plugin_title();
        int is_realtime();
        int is_multichannel();
        int get_parameters();
@@ -94,7 +94,7 @@ InterpolateAllEffect::~InterpolateAllEffect()
 
 
 
-char* InterpolateAllEffect::plugin_title() { return _("Interpolate"); }
+char* InterpolateAllEffect::plugin_title() { return N_("Interpolate"); }
 int InterpolateAllEffect::is_realtime() { return 0; }
 int InterpolateAllEffect::is_multichannel() { return 0; }
 
index 2dd6e32d671df9bbd121d98e3947f3fa889658ad..3657582eecc1affe7fcdd84ea476e6ceb92273b8 100644 (file)
@@ -93,7 +93,7 @@ InterpolateAudioEffect::~InterpolateAudioEffect()
 
 
 
-const char* InterpolateAudioEffect::plugin_title() { return _("Interpolate"); }
+const char* InterpolateAudioEffect::plugin_title() { return N_("Interpolate"); }
 int InterpolateAudioEffect::is_realtime() { return 1; }
 
 
index 83ff93b6a4beecbbfc0b58f999ff69909a31aee6..892298b8b58345fe4a366f8e214c7d899886a9ea 100644 (file)
@@ -846,7 +846,7 @@ int InterpolateVideo::process_buffer(VFrame *frame,
 
 
 NEW_WINDOW_MACRO(InterpolateVideo, InterpolateVideoWindow)
-const char* InterpolateVideo::plugin_title() { return _("Interpolate Video"); }
+const char* InterpolateVideo::plugin_title() { return N_("Interpolate Video"); }
 int InterpolateVideo::is_realtime() { return 1; }
 
 int InterpolateVideo::load_configuration()
index 4cb08b2373db8f5fcf038c167abe53c0e5781915..159fff1b9977c68ca913ea30fe57d73810ddca6d 100644 (file)
@@ -32,7 +32,7 @@ public:
         : PluginAClient(server) {};
        ~InvertAudioEffect() {};
 
-       const char* plugin_title() { return  _("Invert Audio"); };
+       const char* plugin_title() { return N_("Invert Audio"); };
        int is_realtime() { return 1; };
        int process_realtime(int64_t size, Samples *input_ptr, Samples *output_ptr) {
                double *output_samples = output_ptr->get_data();
index fed3f3ef2e1bf188f7b10fa6cfa2cd2ed0ac4cd5..66fd88bb88849174acbb589a78064d5439deaec3 100644 (file)
@@ -201,7 +201,7 @@ InvertVideoEffect::~InvertVideoEffect()
 
 }
 
-const char* InvertVideoEffect::plugin_title() { return _("Invert Video"); }
+const char* InvertVideoEffect::plugin_title() { return N_("Invert Video"); }
 int InvertVideoEffect::is_realtime() { return 1; }
 
 NEW_WINDOW_MACRO(InvertVideoEffect, InvertVideoWindow)
index be72bd4cfa1df3df4915b528824c8d9971ed10e0..0408a394ded6fadb1819b32b38c418c076b901f7 100644 (file)
@@ -141,7 +141,7 @@ IrisSquareMain::~IrisSquareMain()
 
 }
 
-const char* IrisSquareMain::plugin_title() { return _("IrisSquare"); }
+const char* IrisSquareMain::plugin_title() { return N_("IrisSquare"); }
 int IrisSquareMain::is_video() { return 1; }
 int IrisSquareMain::is_transition() { return 1; }
 int IrisSquareMain::uses_gui() { return 1; }
index 8966ea5165d37581d83d80ebab35e48e1b58c071..fc74ad0ef95f16d7906d6e19cacf4083e5406270 100644 (file)
@@ -73,7 +73,7 @@ IVTCMain::~IVTCMain()
        }
 }
 
-const char* IVTCMain::plugin_title() { return _("Inverse Telecine"); }
+const char* IVTCMain::plugin_title() { return N_("Inverse Telecine"); }
 int IVTCMain::is_realtime() { return 1; }
 
 
index c5b4648c9bb825fafe47a3fd8a2e68cafeedfce9..9248b96f857bc12ca05b897c676331106c0acd64 100644 (file)
@@ -584,7 +584,7 @@ LensMain::~LensMain()
 NEW_WINDOW_MACRO(LensMain, LensGUI)
 LOAD_CONFIGURATION_MACRO(LensMain, LensConfig)
 int LensMain::is_realtime() { return 1; }
-const char* LensMain::plugin_title() { return _("Lens"); }
+const char* LensMain::plugin_title() { return N_("Lens"); }
 
 void LensMain::update_gui()
 {
index 30b2a34d84646f93d84e1ce80b3c8416a5ff6195..8f70e467b68ced465f7f88b430f0f3546532df9d 100644 (file)
@@ -193,7 +193,7 @@ void SoundLevelEffect::reset()
        accum_size = 0;
 }
 
-const char* SoundLevelEffect::plugin_title() { return _("SoundLevel"); }
+const char* SoundLevelEffect::plugin_title() { return N_("SoundLevel"); }
 int SoundLevelEffect::is_realtime() { return 1; }
 
 
index 2557f9d196582f80e087266b5452e8ca67434913..5f646b3e29f0525c32a0a3625a656bad5ec550f9 100644 (file)
@@ -388,7 +388,7 @@ LinearBlurMain::~LinearBlurMain()
        if(temp) delete temp;
 }
 
-const char* LinearBlurMain::plugin_title() { return _("Linear Blur"); }
+const char* LinearBlurMain::plugin_title() { return N_("Linear Blur"); }
 int LinearBlurMain::is_realtime() { return 1; }
 
 
index 5fba45ae260017766c4c9aa2bfe44191a46038d7..d0a9591a0d7706efdc8939c5984c6cadfd17dd75 100644 (file)
@@ -374,7 +374,7 @@ void LiveAudio::render_stop()
 }
 
 
-const char* LiveAudio::plugin_title() { return _("Live Audio"); }
+const char* LiveAudio::plugin_title() { return N_("Live Audio"); }
 int LiveAudio::is_realtime() { return 1; }
 int LiveAudio::is_multichannel() { return 1; }
 int LiveAudio::is_synthesis() { return 1; }
index 23edbc732d9d61daa4df0f82b32945b1e4018190..59b4015bfbffbe55a78123b70c7815d174f4fb4c 100644 (file)
@@ -572,7 +572,7 @@ void LiveVideo::render_stop()
 }
 
 
-const char* LiveVideo::plugin_title() { return _("Live Video"); }
+const char* LiveVideo::plugin_title() { return N_("Live Video"); }
 int LiveVideo::is_realtime() { return 1; }
 int LiveVideo::is_multichannel() { return 0; }
 int LiveVideo::is_synthesis() { return 1; }
index 40634795fb475735a559d2662368246e3a54edba..8a21ad6f3bf2f332c0a5bb8129ad7376a323a373 100644 (file)
@@ -178,7 +178,7 @@ LoopAudio::~LoopAudio()
 
 }
 
-const char* LoopAudio::plugin_title() { return _("Loop audio"); }
+const char* LoopAudio::plugin_title() { return N_("Loop audio"); }
 int LoopAudio::is_realtime() { return 1; }
 int LoopAudio::is_synthesis() { return 1; }
 
index e01972d29b78f2e194c10d7fa642a49f59c9778a..f25299a2016e02aa51c7e0fa9c5c761a8926723d 100644 (file)
@@ -176,7 +176,7 @@ LoopVideo::~LoopVideo()
 
 }
 
-const char* LoopVideo::plugin_title() { return _("Loop video"); }
+const char* LoopVideo::plugin_title() { return N_("Loop video"); }
 int LoopVideo::is_realtime() { return 1; }
 int LoopVideo::is_synthesis() { return 1; }
 
index fbbef54c3b5ee7bf80ef28cf4298400752dfcc36..923a183df016f32b8624b2907a629e94357dac23 100644 (file)
@@ -206,7 +206,7 @@ MotionCVMain::~MotionCVMain()
        delete rotate_target_dst;
 }
 
-const char *MotionCVMain::plugin_title() { return _("MotionCV"); }
+const char *MotionCVMain::plugin_title() { return N_("MotionCV"); }
 int MotionCVMain::is_realtime() { return 1; }
 int MotionCVMain::is_multichannel() { return 1; }
 
index b61c654a2d9aa9bbb98518b56124ee7f0e921ec9..ba5b5d198508571c8c15bd174e78c7f7e8469074 100644 (file)
@@ -258,7 +258,7 @@ MotionHVMain::~MotionHVMain()
        delete rotate_target_dst;
 }
 
-const char* MotionHVMain::plugin_title() { return _("MotionHV"); }
+const char* MotionHVMain::plugin_title() { return N_("MotionHV"); }
 int MotionHVMain::is_realtime() { return 1; }
 int MotionHVMain::is_multichannel() { return 1; }
 
index 4661b144ebd9e7dcae0c89fb8dc2b08d9257756d..21468bdeb794d75c4c593226417d649fcec71cf6 100644 (file)
@@ -212,7 +212,7 @@ MotionMain::~MotionMain()
        delete rotate_target_dst;
 }
 
-const char* MotionMain::plugin_title() { return _("Motion"); }
+const char* MotionMain::plugin_title() { return N_("Motion"); }
 int MotionMain::is_realtime() { return 1; }
 int MotionMain::is_multichannel() { return 1; }
 
index 5897ae0e0d768c29c2856a239da86b7511dad62b..103afb07de0888d363d72a42a0a4487d4283ee47 100644 (file)
@@ -242,7 +242,7 @@ MotionMain2::~MotionMain2()
        delete global_target_dst;
 }
 
-const char* MotionMain2::plugin_title() { return _("Motion 2 Point"); }
+const char* MotionMain2::plugin_title() { return N_("Motion 2 Point"); }
 int MotionMain2::is_realtime() { return 1; }
 int MotionMain2::is_multichannel() { return 1; }
 
index cac4ed3a19f857156a3405482fb75f5f84902e11..9e4143f45cbe11510fd7077ff50e4deee02d1132 100644 (file)
@@ -120,7 +120,7 @@ Motion51Main::~Motion51Main()
        delete [] ypts;
 }
 
-const char* Motion51Main::plugin_title() { return _("Motion51"); }
+const char* Motion51Main::plugin_title() { return N_("Motion51"); }
 int Motion51Main::is_realtime() { return 1; }
 int Motion51Main::is_multichannel() { return 1; }
 
index a5bc3be5883c6f32208554517e68a075e1f9d0e0..8777413a1354c6978fef531d0e04a94eae70ff14 100644 (file)
@@ -312,7 +312,7 @@ MotionBlurMain::~MotionBlurMain()
        if(temp) delete temp;
 }
 
-const char* MotionBlurMain::plugin_title() { return _("Motion Blur"); }
+const char* MotionBlurMain::plugin_title() { return N_("Motion Blur"); }
 int MotionBlurMain::is_realtime() { return 1; }
 
 
index def79d53383ccf52a9f8288fb4552d2e9ebcc952..89b201eaf3a0a90a5d971eeb9dd15cf804d3dcb1 100644 (file)
@@ -50,7 +50,7 @@ NormalizeMain::~NormalizeMain()
 {
 }
 
-const char* NormalizeMain::plugin_title() { return _("Normalize"); }
+const char* NormalizeMain::plugin_title() { return N_("Normalize"); }
 int NormalizeMain::is_realtime() { return 0; }
 int NormalizeMain::is_multichannel() { return 1; }
 
index 0b782ab5b02ac7c43231d71956b62f9bb9b0814c..e10141854229cf4cd75dc8e2ef338b8faa3bd37d 100644 (file)
@@ -306,7 +306,7 @@ OilEffect::~OilEffect()
 }
 
 
-const char* OilEffect::plugin_title() { return _("Oil painting"); }
+const char* OilEffect::plugin_title() { return N_("Oil painting"); }
 int OilEffect::is_realtime() { return 1; }
 
 
index fd423d75e74f28afbac4f86b443c90ae7d248d7a..e9909e854812c434c56868266da6cc048ef7ba7a 100644 (file)
@@ -632,7 +632,7 @@ static const char * const overlay_shaders[TRANSFER_TYPES] = {
 }
 
 
-const char* Overlay::plugin_title() { return _("Overlay"); }
+const char* Overlay::plugin_title() { return N_("Overlay"); }
 int Overlay::is_realtime() { return 1; }
 int Overlay::is_multichannel() { return 1; }
 int Overlay::is_synthesis() { return 1; }
index ab7b0793b33b20dfc8018f0028a20c97d3854be0..b5d544577e8dcf648417a559a1b3e32a824abed3 100644 (file)
@@ -328,7 +328,7 @@ OverlayAudio::~OverlayAudio()
 
 }
 
-const char* OverlayAudio::plugin_title() { return _("Overlay"); }
+const char* OverlayAudio::plugin_title() { return N_("Overlay"); }
 int OverlayAudio::is_realtime() { return 1; }
 int OverlayAudio::is_multichannel() { return 1; }
 
index ddf15c48c13eb46bd8c4d9950bcebd78368dd9d5..a19ff7ff3464e2e71ec9f9a1cd2cbb8dedc11eae 100644 (file)
@@ -816,7 +816,7 @@ NEW_WINDOW_MACRO(ParametricEQ, ParametricWindow)
 LOAD_CONFIGURATION_MACRO(ParametricEQ, ParametricConfig)
 
 
-const char* ParametricEQ::plugin_title() { return _("EQ Parametric"); }
+const char* ParametricEQ::plugin_title() { return N_("EQ Parametric"); }
 int ParametricEQ::is_realtime() { return 1; }
 
 void ParametricEQ::read_data(KeyFrame *keyframe)
index a9e2adf3bb676fe4aca0d7fbb0a8e77fef4da23f..5c31ea877c946754f92e8a304d613f9d88419c0d 100644 (file)
@@ -656,7 +656,7 @@ PerspectiveMain::~PerspectiveMain()
        if(temp) delete temp;
 }
 
-const char* PerspectiveMain::plugin_title() { return _("Perspective"); }
+const char* PerspectiveMain::plugin_title() { return N_("Perspective"); }
 int PerspectiveMain::is_realtime() { return 1; }
 
 
index f858456ab2dc74a443577a5bf276f229b01a109a..5c3f3c79a8dbb7eb3f8a1bb3a1d9d40863b95458 100644 (file)
@@ -288,7 +288,7 @@ PhotoScaleMain::~PhotoScaleMain()
        if(engine) delete engine;
 }
 
-const char* PhotoScaleMain::plugin_title() { return _("Auto Scale"); }
+const char* PhotoScaleMain::plugin_title() { return N_("Auto Scale"); }
 int PhotoScaleMain::is_realtime() { return 1; }
 
 
index a1fa01ea3be51274f03b0fa58331331df6fe94e8..6404fdeeddd387a6aa0f33ca89fed94f9276c140 100644 (file)
@@ -51,7 +51,7 @@ Piano::~Piano()
 }
 
 
-char* Piano::plugin_title() { return _("Pianoesizer"); }
+char* Piano::plugin_title() { return N_("Pianoesizer"); }
 int Piano::is_realtime() { return 1; }
 int Piano::is_synthesis() { return 1; }
 
index fa442a952704b5736eafb6c184fe414f6141ef12..d008eb03d3875d6c1862a75bfa975dfaad6319e3 100644 (file)
@@ -125,7 +125,7 @@ public:
        int is_realtime();
        int is_synthesis();
        int load_configuration();
-       char* plugin_title();
+       const char* plugin_title();
        void read_data(KeyFrame *keyframe);
        void save_data(KeyFrame *keyframe);
        int show_gui();
index f6b2c0aee2eada3af1b5fc5cbef777416f54f5f3..c0de9c397db654e1e2c79043dddba3e471124ac7 100644 (file)
@@ -60,7 +60,7 @@ PitchEffect::~PitchEffect()
        if(fft) delete fft;
 }
 
-const char* PitchEffect::plugin_title() { return _("Pitch shift"); }
+const char* PitchEffect::plugin_title() { return N_("Pitch shift"); }
 int PitchEffect::is_realtime() { return 1; }
 
 
index f226720ac6023a087b1c6f9f5cf2de1308913998..3c8ba7a6cbda6388677724e24732b0c7f6b1d22b 100644 (file)
@@ -282,7 +282,7 @@ PolarEffect::~PolarEffect()
 
 
 
-const char* PolarEffect::plugin_title() { return _("Polar"); }
+const char* PolarEffect::plugin_title() { return N_("Polar"); }
 int PolarEffect::is_realtime() { return 1; }
 
 
index 969b8694121838f68986cbb1bc8367b167a57f56..28f532e3adc96e353401e5b27fe0f6dae34c7128 100644 (file)
@@ -380,7 +380,7 @@ RadialBlurMain::~RadialBlurMain()
        delete rotate;
 }
 
-const char* RadialBlurMain::plugin_title() { return _("Radial Blur"); }
+const char* RadialBlurMain::plugin_title() { return N_("Radial Blur"); }
 int RadialBlurMain::is_realtime() { return 1; }
 
 
index 62b14197d38967b866f6789f0eefcbca107d3f77..dc3ddda167b115ec231c10b80e4371441d92950b 100644 (file)
@@ -51,7 +51,7 @@ ReFrame::~ReFrame()
 {
 }
 
-const char* ReFrame::plugin_title() { return _("Reframe"); }
+const char* ReFrame::plugin_title() { return N_("Reframe"); }
 
 
 
index ac5b384679ac8932341314d3822b28959fe82a11..afacecc9737dc51d04f708f5b039cc4afdaa3764 100644 (file)
@@ -387,7 +387,7 @@ ReframeRT::~ReframeRT()
 
 }
 
-const char* ReframeRT::plugin_title() { return _("ReframeRT"); }
+const char* ReframeRT::plugin_title() { return N_("ReframeRT"); }
 int ReframeRT::is_realtime() { return 1; }
 int ReframeRT::is_synthesis() { return 1; }
 
index 7f99dd13236ea426a3d05e6363be597956b973dc..0a87accaf3c971ad4182557d19fa63f01bb2caef 100644 (file)
@@ -194,7 +194,7 @@ RemoveGaps::~RemoveGaps()
        delete temp;
 }
 
-const char* RemoveGaps::plugin_title() { return _("Remove Gaps"); }
+const char* RemoveGaps::plugin_title() { return N_("Remove Gaps"); }
 int RemoveGaps::is_realtime() { return 1; }
 
 NEW_WINDOW_MACRO(RemoveGaps, RemoveGapsWindow)
index 9a8aa6a0b95985b80561f9d5eb0d2b001c06e5f8..f236f23e5911bcdaff71e20f79d1d1c1ec648be5 100644 (file)
@@ -468,7 +468,7 @@ int Reroute::process_buffer(VFrame **frame,
 
 
 
-const char* Reroute::plugin_title() { return _("Reroute"); }
+const char* Reroute::plugin_title() { return N_("Reroute"); }
 int Reroute::is_realtime()             { return 1; }
 int Reroute::is_multichannel()         { return 1; }
 
index 562cbc664382b1121be0758b46f2ec4c82e44c79..29e6a2587fb690fc91e87ea620a4002184465664 100644 (file)
@@ -126,7 +126,7 @@ ResampleEffect::~ResampleEffect()
 {
 }
 
-const char* ResampleEffect::plugin_title() { return _("Resample"); }
+const char* ResampleEffect::plugin_title() { return N_("Resample"); }
 
 void ResampleEffect::reset()
 {
index 409db6dfd319d899acc994fcde19089688de1838..9408afaaa3a9cc4c84035c0a0ac49899f31b7bea 100644 (file)
@@ -220,7 +220,7 @@ ResampleRT::~ResampleRT()
        delete resample;
 }
 
-const char* ResampleRT::plugin_title() { return _("ResampleRT"); }
+const char* ResampleRT::plugin_title() { return N_("ResampleRT"); }
 int ResampleRT::is_realtime() { return 1; }
 int ResampleRT::is_synthesis() { return 1; }
 
index eb60c71dff2617ebe371031fe35b231bc297eb9c..f1aaadeaff5453329edd9599055ad248516c411d 100644 (file)
@@ -98,7 +98,7 @@ Reverb::~Reverb()
        }
 }
 
-const char* Reverb::plugin_title() { return _("Reverb"); }
+const char* Reverb::plugin_title() { return N_("Reverb"); }
 int Reverb::is_realtime() { return 1; }
 int Reverb::is_multichannel() { return 1; }
 int Reverb::is_synthesis() { return 1; }
index 5fe8c49e18dbc73aaa9e5e36fa4ce53c227b08d8..ac735cdd696ea2327f3e5f1f0ec2d925735087e8 100644 (file)
@@ -167,7 +167,7 @@ ReverseAudio::~ReverseAudio()
 
 }
 
-const char* ReverseAudio::plugin_title() { return _("Reverse audio"); }
+const char* ReverseAudio::plugin_title() { return N_("Reverse audio"); }
 int ReverseAudio::is_realtime() { return 1; }
 
 
index e770c7d020da01fcf4e646a7cb5bd696358652bb..eaa5b54ea09d9b040813178fca09802b8d6d1f08 100644 (file)
@@ -175,7 +175,7 @@ ReverseVideo::~ReverseVideo()
 
 }
 
-const char* ReverseVideo::plugin_title() { return _("Reverse video"); }
+const char* ReverseVideo::plugin_title() { return N_("Reverse video"); }
 int ReverseVideo::is_realtime() { return 1; }
 
 
index 5fb34f7e7799cb523cd507f529065c6e417784db..0435464c962aebd04c536007ca089e16b03dd4e1 100644 (file)
@@ -42,7 +42,7 @@ RGB601Main::~RGB601Main()
        delete defaults;
 }
 
-char* RGB601Main::plugin_title() { return _("Inverse Telecine"); }
+char* RGB601Main::plugin_title() { return "Inverse Telecine"; }
 int RGB601Main::is_realtime() { return 1; }
 
 int RGB601Main::load_defaults()
index e04e0f414f5783b2a0f17b9fe908a4e183902135..988f6ec887bc03abfd66f57d818d19593efe11fd 100644 (file)
@@ -51,7 +51,7 @@ RGB601Main::~RGB601Main()
 
 }
 
-const char* RGB601Main::plugin_title() { return _("RGB - 601"); }
+const char* RGB601Main::plugin_title() { return N_("RGB - 601"); }
 int RGB601Main::is_realtime() { return 1; }
 
 
index 165680a2f7b5c821dd0c648b32c0b744d2b9b7f1..1f3d73994b0b0384b2613c073f620a2a1695fae4 100644 (file)
@@ -208,7 +208,7 @@ RGBShiftEffect::~RGBShiftEffect()
        delete temp_frame;
 }
 
-const char* RGBShiftEffect::plugin_title() { return _("RGBShift"); }
+const char* RGBShiftEffect::plugin_title() { return N_("RGBShift"); }
 int RGBShiftEffect::is_realtime() { return 1; }
 
 
index e0497d03493b45371e5cc0d7be26ec34c9396d1f..4c51276f0b17fc9d7100f46ab7fd547306607ca6 100644 (file)
@@ -607,7 +607,7 @@ RotateEffect::~RotateEffect()
 
 
 
-const char* RotateEffect::plugin_title() { return _("Rotate"); }
+const char* RotateEffect::plugin_title() { return N_("Rotate"); }
 int RotateEffect::is_realtime() { return 1; }
 
 
index ec822d15538d6570cb9be8ceb33f332827d91b8b..08e3e2a09ff921ccde2cb36e2560007a812251d7 100644 (file)
@@ -303,7 +303,7 @@ int Rumbler::handle_opengl()
 }
 
 
-const char* Rumbler::plugin_title() { return _("Rumbler"); }
+const char* Rumbler::plugin_title() { return N_("Rumbler"); }
 int Rumbler::is_realtime() { return 1; }
 
 NEW_WINDOW_MACRO(Rumbler, RumblerWindow)
index 7b964fcf6acdb9fe59d12f3dd19fcf3e7a4a3eca..2530dfdcaf0c85da2ecc8bdf3ba61bef70a3856f 100644 (file)
@@ -87,7 +87,7 @@ ScaleMain::~ScaleMain()
        if(overlayer) delete overlayer;
 }
 
-const char* ScaleMain::plugin_title() { return _("Scale"); }
+const char* ScaleMain::plugin_title() { return N_("Scale"); }
 int ScaleMain::is_realtime() { return 1; }
 
 
index 52073c10c7ebdf19e987d1ee42d6818596f359b5..4c200f8a6870d2151f21d7698ca235c60ad7b2f2 100644 (file)
@@ -93,7 +93,7 @@ ScaleRatioMain::~ScaleRatioMain()
        overlayer = 0;
 }
 
-const char* ScaleRatioMain::plugin_title() { return _("Scale Ratio"); }
+const char* ScaleRatioMain::plugin_title() { return N_("Scale Ratio"); }
 int ScaleRatioMain::is_realtime() { return 1; }
 
 
index bb91c5ecc6cd345113758cb4d23827f94d994588..1f80e288876396d638d0f970f976782811282b64 100644 (file)
@@ -344,7 +344,7 @@ ShapeWipeMain::~ShapeWipeMain()
        shape_titles.remove_all_objects();
 }
 
-const char* ShapeWipeMain::plugin_title() { return _("Shape Wipe"); }
+const char* ShapeWipeMain::plugin_title() { return N_("Shape Wipe"); }
 int ShapeWipeMain::is_transition() { return 1; }
 int ShapeWipeMain::uses_gui() { return 1; }
 
index f349eba6628f640396e58f290ac330c6f99f185a..4223c10af9d13c4d5b0587a0e5c9243cdbff7ccc 100644 (file)
@@ -112,7 +112,7 @@ NEW_WINDOW_MACRO(SharpenMain, SharpenWindow)
 
 LOAD_CONFIGURATION_MACRO(SharpenMain, SharpenConfig)
 
-const char* SharpenMain::plugin_title() { return _("Sharpen"); }
+const char* SharpenMain::plugin_title() { return N_("Sharpen"); }
 int SharpenMain::is_realtime() { return 1; }
 
 
index e7d93e7508cf80a89771a9eaf48169b32320d954..90722d6f52957206c793cfe176aa49d29511886d 100644 (file)
@@ -259,7 +259,7 @@ ShiftInterlaceMain::~ShiftInterlaceMain()
 }
 
 
-const char* ShiftInterlaceMain::plugin_title()  { return _("ShiftInterlace"); }
+const char* ShiftInterlaceMain::plugin_title() { return N_("ShiftInterlace"); }
 int ShiftInterlaceMain::is_realtime() { return 1; }
 
 
index 4c918213e96192da79194bb98708f479cbe2bc71..6b893f680c914dca27ec1010cb9f333304ec17b7 100644 (file)
@@ -207,7 +207,7 @@ SlideMain::~SlideMain()
 
 }
 
-const char* SlideMain::plugin_title() { return _("Slide"); }
+const char* SlideMain::plugin_title() { return N_("Slide"); }
 int SlideMain::is_video() { return 1; }
 int SlideMain::is_transition() { return 1; }
 int SlideMain::uses_gui() { return 1; }
index 4648737bc5d6c71e6b2d5161edfe7aa958544140..fc8511284b423af8cbbb6d8354920a22af8cba6b 100644 (file)
@@ -699,7 +699,7 @@ void Spectrogram::reset()
 }
 
 
-const char* Spectrogram::plugin_title() { return _("Spectrogram"); }
+const char* Spectrogram::plugin_title() { return N_("Spectrogram"); }
 int Spectrogram::is_realtime() { return 1; }
 
 int Spectrogram::process_buffer(int64_t size,
index 99d407707702eb01e51b412c6e11badc4306c16e..865dccf012831149f44d773a225d5abfc22578fd 100644 (file)
@@ -622,7 +622,7 @@ Fuse360Main::~Fuse360Main()
 NEW_WINDOW_MACRO(Fuse360Main, Fuse360GUI)
 LOAD_CONFIGURATION_MACRO(Fuse360Main, Fuse360Config)
 int Fuse360Main::is_realtime() { return 1; }
-const char* Fuse360Main::plugin_title() { return N_("360 Fuser"); }
+const char* Fuse360Main::plugin_title() { return "360 Fuser"; }
 
 void Fuse360Main::update_gui()
 {
index 9a7f77442dc4ff241d4b6139883e644332c6d7e1..89499d15c7bb9c4d5ae5c6308ba29f8248467125 100644 (file)
@@ -97,7 +97,7 @@ SvgMain::~SvgMain()
        delete overlayer;
 }
 
-const char* SvgMain::plugin_title() { return _("SVG via Inkscape"); }
+const char* SvgMain::plugin_title() { return N_("SVG via Inkscape"); }
 int SvgMain::is_realtime() { return 1; }
 int SvgMain::is_synthesis() { return 1; }
 
index 3ea0f90067eee9481f2d385607c46d648f2b7d67..d8a6543b197f685f621f5311fc4a484c4f5bb038 100644 (file)
@@ -208,7 +208,7 @@ void SwapMain::reset()
 }
 
 
-const char* SwapMain::plugin_title()  { return _("Swap channels"); }
+const char* SwapMain::plugin_title() { return N_("Swap channels"); }
 int SwapMain::is_synthesis() { return 1; }
 int SwapMain::is_realtime()  { return 1; }
 
index b1f87f5e2b558e0a67b2e65947443fe941206a80..d4270c46204f07d4e3f0a72a22bd5e2ec15014ce 100644 (file)
@@ -213,7 +213,7 @@ SwapFrames::~SwapFrames()
        delete buffer;
 }
 
-const char* SwapFrames::plugin_title() { return _("Swap Frames"); }
+const char* SwapFrames::plugin_title() { return N_("Swap Frames"); }
 int SwapFrames::is_realtime() { return 1; }
 
 NEW_WINDOW_MACRO(SwapFrames, SwapFramesWindow)
index 5838a48ffbc68f69730a17975cdc85bef05b024d..d9fe51e2348d0e0c46a43fb649b406edbf2bf4a2 100644 (file)
@@ -57,7 +57,7 @@ Synth::~Synth()
 
 NEW_WINDOW_MACRO(Synth, SynthWindow);
 
-const char* Synth::plugin_title() { return _("Synthesizer"); }
+const char* Synth::plugin_title() { return N_("Synthesizer"); }
 int Synth::is_realtime() { return 1; }
 int Synth::is_synthesis() { return 1; }
 
index de0343ba9bee87e506819c3d90d2ed6e01c3a3d5..dae8272693042190accd97d4a124e9fbd320ae2f 100644 (file)
@@ -68,10 +68,7 @@ BlondThemeMain::~BlondThemeMain()
 {
 }
 
-const char* BlondThemeMain::plugin_title()
-{
-       return _("Blond");
-}
+const char* BlondThemeMain::plugin_title() { return N_("Blond"); }
 
 Theme* BlondThemeMain::new_theme()
 {
index 6c7a073263f32a1f713940fc220084959cb720c1..be0e7a734a14271933625b7ebd3c9352e4bf970f 100644 (file)
@@ -67,10 +67,7 @@ BlondCVThemeMain::~BlondCVThemeMain()
 {
 }
 
-const char* BlondCVThemeMain::plugin_title()
-{
-       return _("Blond-cv");
-}
+const char* BlondCVThemeMain::plugin_title() { return N_("Blond-cv"); }
 
 Theme* BlondCVThemeMain::new_theme()
 {
index 4551451e582acf00ac932dcec0406669f2f70837..8aff33a4e5260a08584915ecf86180d483a05683 100644 (file)
@@ -66,10 +66,7 @@ BlondThemeMain::~BlondThemeMain()
 {
 }
 
-const char* BlondThemeMain::plugin_title()
-{
-       return _("Blond-cv");
-}
+const char* BlondThemeMain::plugin_title() { return "Blond-cv"; }
 
 Theme* BlondThemeMain::new_theme()
 {
index c66ff351ea081e77390834fe236bf3cb432efd37..1e19085580c9e10220d73ed03a9c21e68a72c349 100644 (file)
@@ -68,10 +68,7 @@ BlueDotThemeMain::~BlueDotThemeMain()
 {
 }
 
-const char* BlueDotThemeMain::plugin_title()
-{
-       return _("Blue");
-}
+const char* BlueDotThemeMain::plugin_title() { return N_("Blue"); }
 
 Theme* BlueDotThemeMain::new_theme()
 {
index b2cb0e7bd5ecbcc5b89cde9274876052b29d0014..1eed422dbc5945ce4ecafcec0de5513263e4a10d 100644 (file)
@@ -70,10 +70,7 @@ BlueDotThemeMain::~BlueDotThemeMain()
 {
 }
 
-const char* BlueDotThemeMain::plugin_title()
-{
-       return _("Blue Dot");
-}
+const char* BlueDotThemeMain::plugin_title() { return N_("Blue Dot"); }
 
 Theme* BlueDotThemeMain::new_theme()
 {
index 9e02df4acc45efde8695112de35f505a416b9d4d..2ad0b127e5067305269eeffff30a093ee251f590 100644 (file)
@@ -66,10 +66,7 @@ BrightThemeMain::~BrightThemeMain()
 {
 }
 
-const char* BrightThemeMain::plugin_title()
-{
-       return _("Bright");
-}
+const char* BrightThemeMain::plugin_title() { return N_("Bright"); }
 
 Theme* BrightThemeMain::new_theme()
 {
index f05a9829a5adc5e2160dbfa675353dd65c263dca..2309ff039d0316a34266aa66bebdcef3d9c5a240 100644 (file)
@@ -69,10 +69,7 @@ HULKTHEMEMain::~HULKTHEMEMain()
 {
 }
 
-const char* HULKTHEMEMain::plugin_title()
-{
-       return _("Hulk");
-}
+const char* HULKTHEMEMain::plugin_title() { return N_("Hulk"); }
 
 Theme* HULKTHEMEMain::new_theme()
 {
index 094796ad69fc50c0c16632ad4025b6af80bb0b29..4007c355a66874e94eeec1e6437bf07afbbed0f5 100644 (file)
@@ -60,10 +60,7 @@ PINKLADYMain::~PINKLADYMain()
 {
 }
 
-const char* PINKLADYMain::plugin_title()
-{
-       return _("PinkLady");
-}
+const char* PINKLADYMain::plugin_title() { return N_("PinkLady"); }
 
 Theme* PINKLADYMain::new_theme()
 {
index 5f66b1546bff001173de08e1599a83f43c5f6736..55ab0f87e3cb28fd7c6bd0416a083b4cdc3319ed 100644 (file)
@@ -65,11 +65,7 @@ SUVMain::SUVMain(PluginServer *server)
 SUVMain::~SUVMain()
 {
 }
-
-const char* SUVMain::plugin_title()
-{
-       return _("S.U.V.");
-}
+const char* SUVMain::plugin_title() { return N_("S.U.V."); }
 
 Theme* SUVMain::new_theme()
 {
index 3273ed8995fb860c56f55a5c927b35a89e75cdf5..5649253db074e8103092dfc8fcdd0884fe23a028 100644 (file)
@@ -63,10 +63,7 @@ UNFLATTHEMEMain::~UNFLATTHEMEMain()
 {
 }
 
-const char* UNFLATTHEMEMain::plugin_title()
-{
-       return _("UnFlat");
-}
+const char* UNFLATTHEMEMain::plugin_title() { return N_("UnFlat"); }
 
 Theme* UNFLATTHEMEMain::new_theme()
 {
index 13231b6e653c9719b82936a88ba596129fbcd6bd..402ba5987d6b069b3a2f6aec172ad134b5fd03bc 100644 (file)
@@ -127,7 +127,7 @@ ThresholdMain::~ThresholdMain()
        delete threshold_engine;
 }
 
-const char* ThresholdMain::plugin_title() { return _("Threshold"); }
+const char* ThresholdMain::plugin_title() { return N_("Threshold"); }
 int ThresholdMain::is_realtime() { return 1; }
 
 
index 0de40c2d62dcab72859961e0deb2cab501c09990..2061c81c3a590bf2138fd98f0cb2ac936b974761 100644 (file)
@@ -116,7 +116,7 @@ TimeAvgMain::~TimeAvgMain()
        if(history_valid) delete [] history_valid;
 }
 
-const char* TimeAvgMain::plugin_title() { return _("Time Average"); }
+const char* TimeAvgMain::plugin_title() { return N_("Time Average"); }
 int TimeAvgMain::is_realtime() { return 1; }
 
 
index 2fdfab31492dc960b90890c0b8fef0bb02ea7a94..2227f7ad2c9c16ae86042021909b1209173b7fc1 100644 (file)
@@ -647,7 +647,7 @@ TimeFrontMain::~TimeFrontMain()
        if(overlayer) delete overlayer;
 }
 
-const char* TimeFrontMain::plugin_title() { return _("TimeFront"); }
+const char* TimeFrontMain::plugin_title() { return N_("TimeFront"); }
 int TimeFrontMain::is_realtime() { return 1; }
 int TimeFrontMain::is_multichannel() { return 1; }
 
index b23954a2edea755df1ebe0e9b97674be813ae46e..780c452a55fdf88518106600cf5cce30315fb24a 100644 (file)
@@ -351,7 +351,7 @@ TimeStretch::~TimeStretch()
 
 
 
-const char* TimeStretch::plugin_title() { return _("Time stretch"); }
+const char* TimeStretch::plugin_title() { return N_("Time stretch"); }
 
 int TimeStretch::get_parameters()
 {
index 89b7efa4bc3a47a4b475a8327235d26faa91f080..84a865789abc958e7033c93b79af4ed09d3d3dde 100644 (file)
@@ -222,7 +222,7 @@ TimeStretchRT::~TimeStretchRT()
        delete engine;
 }
 
-const char* TimeStretchRT::plugin_title() { return _("Time Stretch RT"); }
+const char* TimeStretchRT::plugin_title() { return N_("Time Stretch RT"); }
 int TimeStretchRT::is_realtime() { return 1; }
 int TimeStretchRT::is_synthesis() { return 1; }
 
index 27ed9a1fd9ee7e8260c49ccef789dc8fae6d3e58..940462b144ee0363fb52b02da52258b6a90d7c22 100644 (file)
@@ -1144,7 +1144,7 @@ TitleMain::~TitleMain()
        delete outline_engine;
 }
 
-const char* TitleMain::plugin_title() { return C_("Title"); }
+const char* TitleMain::plugin_title() { return N_("Title"); }
 int TitleMain::is_realtime() { return 1; }
 int TitleMain::is_synthesis() { return 1; }
 
index ce112b04349ddffb9e92d984ab7938c7f4f5f017..e69f8087b4249e05c5c30ba0e6db69ba4465b187 100644 (file)
@@ -112,7 +112,7 @@ TranslateMain::~TranslateMain()
        overlayer = 0;
 }
 
-const char* TranslateMain::plugin_title() { return _("Translate"); }
+const char* TranslateMain::plugin_title() { return N_("Translate"); }
 int TranslateMain::is_realtime() { return 1; }
 
 
index 5e5c61b820fd8f498bc34b2eca78d0f80257dcc5..96364d9a77ea02c37b5f933fff5c24d5c5f6c20f 100644 (file)
@@ -102,7 +102,7 @@ UnsharpMain::~UnsharpMain()
        delete engine;
 }
 
-const char* UnsharpMain::plugin_title() { return _("Unsharp"); }
+const char* UnsharpMain::plugin_title() { return N_("Unsharp"); }
 int UnsharpMain::is_realtime() { return 1; }
 
 
index 577224326d6a5cd2781d7ac1e95058faab0ef9e9..0744e83c60824b6ddaaf955d7fd085594b3b23bd 100644 (file)
@@ -235,7 +235,7 @@ VideoScopeEffect::~VideoScopeEffect()
 
 
 
-const char* VideoScopeEffect::plugin_title() { return _("VideoScope"); }
+const char* VideoScopeEffect::plugin_title() { return N_("VideoScope"); }
 int VideoScopeEffect::is_realtime() { return 1; }
 
 int VideoScopeEffect::load_configuration()
index 17a1de090c80e108617b45be8046b34b3bf34e1c..8e1172963b8b73dfb8b3581003543d4083584234 100644 (file)
@@ -360,7 +360,7 @@ NEW_WINDOW_MACRO(Vocoder, VocoderWindow)
 LOAD_CONFIGURATION_MACRO(Vocoder, VocoderConfig)
 
 
-const char* Vocoder::plugin_title() { return _("Vocoder"); }
+const char* Vocoder::plugin_title() { return N_("Vocoder"); }
 int Vocoder::is_realtime() { return 1; }
 int Vocoder::is_multichannel() { return 1; }
 
index 82b750ce46c95e0d0d5d99d3b64a8ed840ac5121..5e2ab3a4d9401c3b7d71308fb84dd637c9cbc8b3 100644 (file)
@@ -443,7 +443,7 @@ WaveEffect::~WaveEffect()
 }
 
 
-const char* WaveEffect::plugin_title() { return _("Wave"); }
+const char* WaveEffect::plugin_title() { return N_("Wave"); }
 int WaveEffect::is_realtime() { return 1; }
 
 
index 3b0344902fd8d50e61e522cb53b5389e761258cd..25be3bc9b0f30f011c423d1d9597d10ddff264dc 100644 (file)
@@ -363,7 +363,7 @@ WhirlEffect::~WhirlEffect()
 
 
 
-const char* WhirlEffect::plugin_title() { return _("Whirl"); }
+const char* WhirlEffect::plugin_title() { return N_("Whirl"); }
 int WhirlEffect::is_realtime() { return 1; }
 
 
index 476de6890be2ca4b74b62416ad8d5b020659455d..04ea8165a44e5ebe066532398f5ef902a893667e 100644 (file)
@@ -44,7 +44,7 @@ public:
        int process_realtime(long size, VFrame **input_ptr, VFrame **output_ptr);
        int plugin_is_realtime();
        int plugin_is_multi_channel();
-       char* plugin_title();
+       const char* plugin_title();
        int start_realtime();
        int stop_realtime();
        PluginClientWindow* new_window();
index c7e89cabfadb8bc216222fe5eb43c1350e7d4509..71b1d722ef4b6f7b947a88e6353489a57e4dfb63 100644 (file)
@@ -143,7 +143,7 @@ WipeMain::~WipeMain()
 
 }
 
-const char* WipeMain::plugin_title() { return _("Wipe"); }
+const char* WipeMain::plugin_title() { return N_("Wipe"); }
 int WipeMain::is_video() { return 1; }
 int WipeMain::is_transition() { return 1; }
 int WipeMain::uses_gui() { return 1; }
index 83f7f03c2d26cda46deb1d2b5b6804e7092e44fa..c6b7313444d28c91d465e1bd6f8d80a793c8ccd0 100644 (file)
@@ -206,7 +206,7 @@ YUVEffect::~YUVEffect()
 
 }
 
-const char* YUVEffect::plugin_title() { return _("YUV"); }
+const char* YUVEffect::plugin_title() { return N_("YUV"); }
 int YUVEffect::is_realtime() { return 1; }
 
 
index 84ead782ae1a9465cdd50efd56e2b848feb45edc..79ca1859529a5f47b80814d94afba66ad5d44837 100644 (file)
@@ -70,7 +70,7 @@ yuv411Main::~yuv411Main()
        delete temp_frame;
 }
 
-const char *yuv411Main::plugin_title() { return _("YUV411"); }
+const char *yuv411Main::plugin_title() { return N_("YUV411"); }
 int yuv411Main::is_realtime() { return 1; }
 
 #define YUV411_MACRO(type, components) \
index 558c4804d42fe351064d97d27f15a1e8270239c7..7298efcb763402cb5c1571c9976bf311b803c995 100644 (file)
@@ -208,7 +208,7 @@ YUVShiftEffect::~YUVShiftEffect()
        delete temp_frame;
 }
 
-const char* YUVShiftEffect::plugin_title() { return _("YUVShift"); }
+const char* YUVShiftEffect::plugin_title() { return N_("YUVShift"); }
 int YUVShiftEffect::is_realtime() { return 1; }
 
 
index b5c74d0373d35763253658f5a295abf8b7932a08..c9c4301f422d26afa462d71841b20d7d8ce5d810 100644 (file)
@@ -144,7 +144,7 @@ ZoomMain::~ZoomMain()
        delete temp;
 }
 
-const char* ZoomMain::plugin_title() { return _("Zoom"); }
+const char* ZoomMain::plugin_title() { return N_("Zoom"); }
 int ZoomMain::is_video() { return 1; }
 int ZoomMain::is_transition() { return 1; }
 int ZoomMain::uses_gui() { return 1; }
index aa7e87b1c210dc3f9d611fd077d8a5194146f98e..4499ea292c26bfdb2828f763815d313edd02e443 100644 (file)
@@ -399,7 +399,7 @@ ZoomBlurMain::~ZoomBlurMain()
        if(temp) delete temp;
 }
 
-const char* ZoomBlurMain::plugin_title() { return _("Zoom Blur"); }
+const char* ZoomBlurMain::plugin_title() { return N_("Zoom Blur"); }
 int ZoomBlurMain::is_realtime() { return 1; }