fix for F_sine segv, bunch of intl fixes

diff --git a/cinelerra-5.1/cinelerra/channelinfo.C b/cinelerra-5.1/cinelerra/channelinfo.C
index a044338e459e357445256cbcbf339958d87da1b5..4a5bdaadcc40b98c0efad98a6f777def20ccd9ea 100644 (file)
--- a/cinelerra-5.1/cinelerra/channelinfo.C
+++ b/cinelerra-5.1/cinelerra/channelinfo.C
@@ -337,7 +337,7 @@ ChanSearchGUI::ChanSearchGUI(ChanSearch *cswindow)
        search_columns[1] = 1;
        search_columns[2] = 2;
        search_column_titles[0] = _("Source");
-       search_column_titles[1] = _("Title");
+       search_column_titles[1] = C_("Title");
        search_column_titles[2] = _("Start time");
        search_column_widths[0] = 120;
        search_column_widths[2] = 120;

diff --git a/cinelerra-5.1/cinelerra/dbwindow.C b/cinelerra-5.1/cinelerra/dbwindow.C
index ec89045824f50c88ab07c571316ec6a48870c969..5d93549f12ccd6323d3cac4adefc544f190983ab 100644 (file)
--- a/cinelerra-5.1/cinelerra/dbwindow.C
+++ b/cinelerra-5.1/cinelerra/dbwindow.C
@@ -588,7 +588,7 @@ DbWindowGUI(DbWindow *dwindow)
        search_column_titles[col_id] = _("Id");
        search_column_titles[col_length] = _("length");
        search_column_titles[col_source] = _("Source");
-       search_column_titles[col_title] = _("Title");
+       search_column_titles[col_title] = C_("Title");
        search_column_titles[col_start_time] = _("Start time");
        search_column_titles[col_access_time] = _("Access time");
        search_column_titles[col_access_count] = _("count");

diff --git a/cinelerra-5.1/cinelerra/exportedl.C b/cinelerra-5.1/cinelerra/exportedl.C
index 7c8afaa24b6a9ef521b0f7677c7bf86faa2ebd33..8cbbbf3f238ae3950197d2cb57ff71e8f226bf22 100644 (file)
--- a/cinelerra-5.1/cinelerra/exportedl.C
+++ b/cinelerra-5.1/cinelerra/exportedl.C
@@ -325,33 +325,31 @@ void ExportEDL::run()
 #define WIDTH 410
 #define HEIGHT 400
 
-static const char *list_titles[] =
+static const char *default_list_titles[] =
 {
        N_("No."),
        N_("Track name")
 };
 
-
-static int list_widths[] =
+static int default_list_widths[] =
 {
        40,
        200
 };
 
+
 ExportEDLWindow::ExportEDLWindow(MWindow *mwindow, ExportEDL *exportedl, ExportEDLAsset *exportasset)
  : BC_Window(_(PROGRAM_NAME ": Export EDL"),
        mwindow->gui->get_screen_w(1, 0) / 2 - WIDTH / 2,
        mwindow->gui->get_root_h(1) / 2 - HEIGHT / 2,
-       WIDTH,
-       HEIGHT,
-       (int)BC_INFINITY,
-       (int)BC_INFINITY,
-       0,
-       0,
-       1)
+       WIDTH, HEIGHT, (int)BC_INFINITY, (int)BC_INFINITY, 0, 0, 1)
 {
        this->mwindow = mwindow;
        this->exportasset = exportasset;
+       for( int i=0; i<2; ++i ) {
+               list_titles[i] = _(default_list_titles[i]);
+               list_widths[i] = default_list_widths[i];
+       }
 }
 
 ExportEDLWindow::~ExportEDLWindow()
@@ -411,7 +409,7 @@ void ExportEDLWindow::create_objects()
        }
 
 
-       add_subwindow(track_list = new ExportEDLWindowTrackList(this, x, y, 400, 200, items_tracks));
+       add_subwindow(track_list = new ExportEDLWindowTrackList(this, x, y, 400, 200));
 
        y += 5 + track_list->get_h();
        add_subwindow(new BC_Title(x, y, _("Currently only CMX 3600 format is supported")));
@@ -439,19 +437,11 @@ int ExportEDLPathText::handle_event()
 }
 
 ExportEDLWindowTrackList::ExportEDLWindowTrackList(ExportEDLWindow *window,
-       int x,
-       int y,
-       int w,
-       int h,
-       ArrayList<BC_ListBoxItem*> *track_list)
- : BC_ListBox(x,
-               y,
-               w,
-               h,
-               LISTBOX_TEXT,
-               track_list,
-               list_titles,
-               list_widths,
+       int x, int y, int w, int h)
+ : BC_ListBox(x, y, w, h, LISTBOX_TEXT,
+               window->items_tracks,
+               window->list_titles,
+               window->list_widths,
                2)
 {
        this->window = window;

diff --git a/cinelerra-5.1/cinelerra/exportedl.h b/cinelerra-5.1/cinelerra/exportedl.h
index fdd183bb8d2d3c5e13449718c33728c0c12c0914..79e34be7c72bb97b915b35265afb9154560b889d 100644 (file)
--- a/cinelerra-5.1/cinelerra/exportedl.h
+++ b/cinelerra-5.1/cinelerra/exportedl.h
@@ -122,8 +122,9 @@ public:
        ExportEDLPathText *path_textbox;
        BC_RecentList *path_recent;
        ExportEDLWindowTrackList *track_list;
-
        ArrayList<BC_ListBoxItem*> items_tracks[2];
+       const char *list_titles[2];
+       int list_widths[2];
 
        MWindow *mwindow;
 };
@@ -146,11 +147,7 @@ class ExportEDLWindowTrackList : public BC_ListBox
 {
 public:
        ExportEDLWindowTrackList(ExportEDLWindow *window,
-               int x,
-               int y,
-               int w,
-               int h,
-               ArrayList<BC_ListBoxItem*> *track_list);
+               int x, int y, int w, int h);
 
        int handle_event();
        ExportEDLWindow *window;

diff --git a/cinelerra-5.1/cinelerra/keyframegui.C b/cinelerra-5.1/cinelerra/keyframegui.C
index d7d297411a7ed868a9519a26a5865bfedb2993e3..c60459c985cda012656ec4fcc90aebe390a79298 100644 (file)
--- a/cinelerra-5.1/cinelerra/keyframegui.C
+++ b/cinelerra-5.1/cinelerra/keyframegui.C
@@ -479,7 +479,7 @@ void KeyFrameWindow::create_objects()
 
 
        add_subwindow(title1 = new BC_Title(theme->keyframe_list_x,
-               theme->keyframe_list_y - BC_Title::calculate_h(this, (char*)_("Py"), LARGEFONT) - 
+               theme->keyframe_list_y - BC_Title::calculate_h(this, (char*)"Py", LARGEFONT) - 
                        theme->widget_border, _("Keyframe parameters:"), LARGEFONT));
        add_subwindow(keyframe_list = new KeyFrameList(thread,
                this,
@@ -505,7 +505,7 @@ void KeyFrameWindow::create_objects()
 
 #endif
        add_subwindow(title4 = new BC_Title(theme->presets_list_x, theme->presets_list_y - 
-                       BC_Title::calculate_h(this, (char*)_("Py"), LARGEFONT) - 
+                       BC_Title::calculate_h(this, (char*)"Py", LARGEFONT) - 
                        theme->widget_border, _("Presets:"), LARGEFONT));
        add_subwindow(preset_list = new KeyFramePresetsList(thread, this,
                theme->presets_list_x, theme->presets_list_y,
@@ -796,7 +796,7 @@ KeyFramePresetsSave::KeyFramePresetsSave(KeyFrameThread *thread,
        KeyFrameWindow *window,
        int x,
        int y)
-: BC_GenericButton(x, y, _("Save"))
+: BC_GenericButton(x, y, C_("Save"))
 {
        this->thread = thread;
        this->window = window;

diff --git a/cinelerra-5.1/cinelerra/performanceprefs.C b/cinelerra-5.1/cinelerra/performanceprefs.C
index 148670a07b33ef6292b1c16afa5577548f5f2f0b..e3c7e2ca7b424082c9230187f01bb2e33ff23eb3 100644 (file)
--- a/cinelerra-5.1/cinelerra/performanceprefs.C
+++ b/cinelerra-5.1/cinelerra/performanceprefs.C
@@ -274,7 +274,7 @@ void PerformancePrefs::generate_node_list()
        }
 }
 
-static const char *titles[] =
+static const char *default_titles[] =
 {
        N_("On"),
        N_("Hostname"),
@@ -282,7 +282,7 @@ static const char *titles[] =
        N_("Framerate")
 };
 
-static int widths[] =
+static int default_widths[] =
 {
        30,
        150,
@@ -293,13 +293,13 @@ static int widths[] =
 
 void PerformancePrefs::update_node_list()
 {
-       node_list->update(nodes,
-                                               titles,
-                                               widths,
-                                               TOTAL_COLUMNS,
-                                               node_list->get_xposition(),
-                                               node_list->get_yposition(),
-                                               node_list->get_selection_number(0, 0));
+       node_list->update_list();
+}
+
+void PrefsRenderFarmNodes::update_list()
+{
+       update(subwindow->nodes, titles, widths, PerformancePrefs::TOTAL_COLUMNS,
+               get_xposition(), get_yposition(), get_selection_number(0, 0));
 }
 
 
@@ -546,19 +546,18 @@ int PrefsRenderFarmPort::handle_event()
 
 
 PrefsRenderFarmNodes::PrefsRenderFarmNodes(PreferencesWindow *pwindow,
-       PerformancePrefs *subwindow,
-       int x,
-       int y)
- : BC_ListBox(x,
-               y,
-               340,
-               230,
+       PerformancePrefs *subwindow, int x, int y)
+ : BC_ListBox(x, y, 340, 230,
                LISTBOX_TEXT,                         // Display text list or icons
                subwindow->nodes,
-               titles,
-               widths,
-               4)
+               0, //default_titles,
+               0, //default_widths,
+               PerformancePrefs::TOTAL_COLUMNS)
 {
+       for( int i=0; i<PerformancePrefs::TOTAL_COLUMNS; ++i ) {
+               titles[i] = _(default_titles[i]);
+               widths[i] = default_widths[i];
+       }
        this->subwindow = subwindow;
        this->pwindow = pwindow;
 }
@@ -568,7 +567,7 @@ PrefsRenderFarmNodes::~PrefsRenderFarmNodes()
 
 int PrefsRenderFarmNodes::column_resize_event()
 {
-       for(int i = 0; i < 3; i++)
+       for( int i=0; i<PerformancePrefs::TOTAL_COLUMNS; ++i )
                widths[i] = get_column_width(i);
        return 1;
 }

diff --git a/cinelerra-5.1/cinelerra/performanceprefs.h b/cinelerra-5.1/cinelerra/performanceprefs.h
index b0d7e65f4a8b529b3106560888f5faaf7a6e12bd..6e1e99c80f6b81a3217717a41e6c2b8e4eeb0001 100644 (file)
--- a/cinelerra-5.1/cinelerra/performanceprefs.h
+++ b/cinelerra-5.1/cinelerra/performanceprefs.h
@@ -56,7 +56,7 @@ public:
                TOTAL_COLUMNS
        };
 
-       ArrayList<BC_ListBoxItem*> nodes[4];
+       ArrayList<BC_ListBoxItem*> nodes[TOTAL_COLUMNS];
        PrefsRenderFarmEditNode *edit_node;
        PrefsRenderFarmPort *edit_port;
        PrefsRenderFarmNodes *node_list;
@@ -238,6 +238,10 @@ public:
        int handle_event();
        int selection_changed();
        int column_resize_event();
+       void update_list();
+
+       const char *titles[PerformancePrefs::TOTAL_COLUMNS];
+       int widths[PerformancePrefs::TOTAL_COLUMNS];
 
        PreferencesWindow *pwindow;
        PerformancePrefs *subwindow;

diff --git a/cinelerra-5.1/cinelerra/pluginfclient.C b/cinelerra-5.1/cinelerra/pluginfclient.C
index 56b459587222e120a996a1cc2fb7f89995c77779..2a35e96c7539c2039e2914471d1926502f9e484e 100644 (file)
--- a/cinelerra-5.1/cinelerra/pluginfclient.C
+++ b/cinelerra-5.1/cinelerra/pluginfclient.C
@@ -836,6 +836,11 @@ int PluginFAClient::process_buffer(int64_t size, Samples **buffer, int64_t start
        if( ret >= 0 ) {
                in_channels = get_inchannels();
                out_channels = get_outchannels();
+               frame->nb_samples = size;
+               frame->format = AV_SAMPLE_FMT_FLTP;
+               frame->channel_layout = (1<<in_channels)-1;
+               frame->sample_rate = sample_rate;
+               frame->pts = local_to_edl(filter_position);
        }
 
        int retry = 10;
@@ -846,11 +851,6 @@ int PluginFAClient::process_buffer(int64_t size, Samples **buffer, int64_t start
                for( int i=0; i<total_in; ++i )
                        read_samples(buffer[i], i, sample_rate, filter_position, size);
                filter_position += size;
-               frame->nb_samples = size;
-               frame->format = AV_SAMPLE_FMT_FLTP;
-               frame->channel_layout = (1<<in_channels)-1;
-               frame->sample_rate = sample_rate;
-               frame->pts = local_to_edl(filter_position);
                ret = av_frame_get_buffer(frame, 0);
                if( ret < 0 ) break;
                float **in_buffers = (float **)&frame->extended_data[0];

diff --git a/cinelerra-5.1/cinelerra/presetsgui.C b/cinelerra-5.1/cinelerra/presetsgui.C.sav1
similarity index 99%
rename from cinelerra-5.1/cinelerra/presetsgui.C
rename to cinelerra-5.1/cinelerra/presetsgui.C.sav1
index c5dbe8e9ea8d9544bfeac03548c5ba097baf7c87..b3ad7ed8d856f19bedef223f9930a023e9bd9a45 100644 (file)
--- a/cinelerra-5.1/cinelerra/presetsgui.C
+++ b/cinelerra-5.1/cinelerra/presetsgui.C.sav1
@@ -332,7 +332,7 @@ PresetsSave::PresetsSave(PresetsThread *thread,
        PresetsWindow *window,
        int x,
        int y)
-: BC_GenericButton(x, y, _("Save"))
+: BC_GenericButton(x, y, C_("Save"))
 {
        this->thread = thread;
        this->window = window;

diff --git a/cinelerra-5.1/cinelerra/recordbatches.C b/cinelerra-5.1/cinelerra/recordbatches.C
index df576ed175eb9060558d516f9f4749f4e1f7e164..0fe7d76b2f87919bc33d9b39effd83db26ba75bc 100644 (file)
--- a/cinelerra-5.1/cinelerra/recordbatches.C
+++ b/cinelerra-5.1/cinelerra/recordbatches.C
@@ -18,7 +18,7 @@
 #include "timeentry.h"
 
 const char * RecordBatches::
-batch_titles[] = {
+default_batch_titles[] = {
        N_("On"), N_("Path"), N_("News"), N_("Start time"),
        N_("Duration"), N_("Source"), N_("Mode")
 };
@@ -37,6 +37,7 @@ load_defaults(ChannelDB * channeldb, Record * record)
        early_margin = defaults->get("RECORD_EARLY_MARGIN", early_margin);
        late_margin = defaults->get("RECORD_LATE_MARGIN", late_margin);
        for(int i = 0; i < BATCH_COLUMNS; i++) {
+               batch_titles[i] = _(default_batch_titles[i]);
                sprintf(string, "BATCH_COLUMNWIDTH_%d", i);
                column_widths[i] = defaults->get(string, default_columnwidth[i]);
        }

diff --git a/cinelerra-5.1/cinelerra/recordbatches.h b/cinelerra-5.1/cinelerra/recordbatches.h
index b0a4be2b7558f10dc2b95840e4e0ac52c8c09e8e..c587281c4caa9ade69b0b431b3c3593cdb2a3160 100644 (file)
--- a/cinelerra-5.1/cinelerra/recordbatches.h
+++ b/cinelerra-5.1/cinelerra/recordbatches.h
@@ -18,14 +18,15 @@ class RecordBatchesGUI;
 class RecordBatches
 {
 public:
-       static const char* batch_titles[];
-       static const int default_columnwidth[];
        RecordBatchesGUI *gui;
        MWindow *mwindow;
 //  Don't want to interrupt recording to edit a different batch.
        int current_item; // Current batch being recorded.
        int editing_item; // Current batch being edited.
        int batch_active;
+       static const char* default_batch_titles[];
+       const char *batch_titles[BATCH_COLUMNS];
+       static const int default_columnwidth[];
        int column_widths[BATCH_COLUMNS];
        ArrayList<BC_ListBoxItem*> data[BATCH_COLUMNS];
        ArrayList<Batch*> batches;

diff --git a/cinelerra-5.1/cinelerra/swindow.C b/cinelerra-5.1/cinelerra/swindow.C
index ea052eebb2580a6684aa5552e6f08a736cd66184..fd173764f8eab5d61e4d4218c986e0a3af099422 100644 (file)
--- a/cinelerra-5.1/cinelerra/swindow.C
+++ b/cinelerra-5.1/cinelerra/swindow.C
@@ -114,7 +114,7 @@ int SWindowLoadFile::handle_event()
 }
 
 SWindowSaveFile::SWindowSaveFile(SWindowGUI *gui, int x, int y)
- : BC_GenericButton(x, y, C_("Save"))
+ : BC_GenericButton(x, y, _("Save"))
 {
        this->sw_gui = gui;
 }

diff --git a/cinelerra-5.1/plugins/crikey/crikeywindow.C b/cinelerra-5.1/plugins/crikey/crikeywindow.C
index c55b98c73016d607dcc75948240712847b58c023..a289a6d128a530ebb514e7b50138cf6c57e5cabd 100644 (file)
--- a/cinelerra-5.1/plugins/crikey/crikeywindow.C
+++ b/cinelerra-5.1/plugins/crikey/crikeywindow.C
@@ -619,7 +619,7 @@ int CriKeyNewPoint::handle_event()
 }
 
 CriKeyDelPoint::CriKeyDelPoint(CriKeyWindow *gui, CriKey *plugin, int x, int y)
- : BC_GenericButton(x, y, 80, _("Del"))
+ : BC_GenericButton(x, y, 80, C_("Del"))
 {
        this->gui = gui;
        this->plugin = plugin;