upgrade libvpx+lv2, fix dbl tap play bug, add multi nest/unnest clips, add del top...

diff --git a/cinelerra-5.1/cinelerra/clippopup.C b/cinelerra-5.1/cinelerra/clippopup.C
index 595155c0d8440c9fd5fc06c2bf28f8a618ae7477..ab7efaf5b7c4a11c91ff08fdbc9c826e292a2bb1 100644 (file)
--- a/cinelerra-5.1/cinelerra/clippopup.C
+++ b/cinelerra-5.1/cinelerra/clippopup.C
@@ -434,8 +434,10 @@ int ClipPopupNest::handle_event()
        gui->lock_window("ClipPopupNest::handle_event 1");
        if( mwindow->edl->session->proxy_scale != 1 ) {
                eprintf("Nesting not allowed when proxy scale != 1");
        gui->lock_window("ClipPopupNest::handle_event 1");
        if( mwindow->edl->session->proxy_scale != 1 ) {
                eprintf("Nesting not allowed when proxy scale != 1");

+               return 1;

        }
        }

-       else if( mwindow->session->drag_clips->total > 0 ) {
+       int clips_total = mwindow->session->drag_clips->total;
+       for( int i=0; i<clips_total; ++i ) {

                EDL *edl = mwindow->edl;
                time_t dt;      time(&dt);
                struct tm dtm;  localtime_r(&dt, &dtm);
                EDL *edl = mwindow->edl;
                time_t dt;      time(&dt);
                struct tm dtm;  localtime_r(&dt, &dtm);


@@ -443,19 +445,19 @@ int ClipPopupNest::handle_event()
                sprintf(path, _("Nested_%02d%02d%02d-%02d%02d%02d"),
                        dtm.tm_year+1900, dtm.tm_mon+1, dtm.tm_mday,
                        dtm.tm_hour, dtm.tm_min, dtm.tm_sec);
                sprintf(path, _("Nested_%02d%02d%02d-%02d%02d%02d"),
                        dtm.tm_year+1900, dtm.tm_mon+1, dtm.tm_mday,
                        dtm.tm_hour, dtm.tm_min, dtm.tm_sec);

-               EDL *clip = mwindow->session->drag_clips->values[0];
+               EDL *clip = mwindow->session->drag_clips->values[i];

                EDL *nested = edl->new_nested(clip, path);
                EDL *new_clip = edl->create_nested_clip(nested);
                new_clip->folder_no = AW_CLIP_FOLDER;
                EDL *nested = edl->new_nested(clip, path);
                EDL *new_clip = edl->create_nested_clip(nested);
                new_clip->folder_no = AW_CLIP_FOLDER;

-                sprintf(new_clip->local_session->clip_icon,
-                        "clip_%02d%02d%02d-%02d%02d%02d.png",
-                        dtm.tm_year+1900, dtm.tm_mon+1, dtm.tm_mday,
-                        dtm.tm_hour, dtm.tm_min, dtm.tm_sec);
+               sprintf(new_clip->local_session->clip_icon,
+                       "clip_%02d%02d%02d-%02d%02d%02d.png",
+                       dtm.tm_year+1900, dtm.tm_mon+1, dtm.tm_mday,
+                       dtm.tm_hour, dtm.tm_min, dtm.tm_sec);

                snprintf(new_clip->local_session->clip_title,
                        sizeof(new_clip->local_session->clip_title),
                        _("Nested: %s"), clip->local_session->clip_title);
                strcpy(new_clip->local_session->clip_notes,
                snprintf(new_clip->local_session->clip_title,
                        sizeof(new_clip->local_session->clip_title),
                        _("Nested: %s"), clip->local_session->clip_title);
                strcpy(new_clip->local_session->clip_notes,

-                       clip->local_session->clip_notes);
+               clip->local_session->clip_notes);

                int idx = edl->clips.number_of(clip);
                if( idx >= 0 ) {
                        edl->clips[idx] = new_clip;
                int idx = edl->clips.number_of(clip);
                if( idx >= 0 ) {
                        edl->clips[idx] = new_clip;


@@ -464,9 +466,9 @@ int ClipPopupNest::handle_event()
                else
                        edl->clips.append(new_clip);
                mwindow->mainindexes->add_next_asset(0, nested);
                else
                        edl->clips.append(new_clip);
                mwindow->mainindexes->add_next_asset(0, nested);

-               mwindow->mainindexes->start_build();
-               popup->gui->async_update_assets();

        }
        }

+       mwindow->mainindexes->start_build();
+       popup->gui->async_update_assets();

        gui->unlock_window();
        return 1;
 }
        gui->unlock_window();
        return 1;
 }


@@ -487,8 +489,9 @@ int ClipPopupUnNest::handle_event()
        EDL *nested_edl = 0;
        MWindowGUI *gui = mwindow->gui;
        gui->lock_window("ClipPopupUnNest::handle_event 1");
        EDL *nested_edl = 0;
        MWindowGUI *gui = mwindow->gui;
        gui->lock_window("ClipPopupUnNest::handle_event 1");

-       if( mwindow->session->drag_clips->total > 0 ) {
-               EDL *clip = mwindow->session->drag_clips->values[0];
+       int clips_total = mwindow->session->drag_clips->total;
+       for( int i=0; i<clips_total; ++i ) {
+               EDL *clip = mwindow->session->drag_clips->values[i];

                Track *track = clip->tracks->first;
                Edit *edit = track ? track->edits->first : 0;
                nested_edl = edit && !edit->next && !edit->asset ? edit->nested_edl : 0;
                Track *track = clip->tracks->first;
                Edit *edit = track ? track->edits->first : 0;
                nested_edl = edit && !edit->next && !edit->asset ? edit->nested_edl : 0;

diff --git a/cinelerra-5.1/cinelerra/dvdcreate.C b/cinelerra-5.1/cinelerra/dvdcreate.C
index 157f17ee23db4f99c115a432b97d03e08ffa12f1..5bbe2efd75b9a5e86237c61190a06c7cd0c7061e 100644 (file)
--- a/cinelerra-5.1/cinelerra/dvdcreate.C
+++ b/cinelerra-5.1/cinelerra/dvdcreate.C
@@ -83,9 +83,9 @@ const double CreateDVD_Thread::DVD_KAUDIO_RATE = 224;
 
 
 CreateDVD_MenuItem::CreateDVD_MenuItem(MWindow *mwindow)
 
 
 CreateDVD_MenuItem::CreateDVD_MenuItem(MWindow *mwindow)

- : BC_MenuItem(_("DVD Render..."), _("Shift-D"), 'D')
+ : BC_MenuItem(_("DVD Render..."), _("Alt-d"), 'd')

 {
 {

-       set_shift(1);
+       set_alt(1);

        this->mwindow = mwindow;
 }
 
        this->mwindow = mwindow;
 }
 

diff --git a/cinelerra-5.1/cinelerra/mainindexes.C b/cinelerra-5.1/cinelerra/mainindexes.C
index 05812bb7c02b47ca1414e455e071e5c16eabfe5b..0183c62afefe7c28db2276742158592b832d3ebc 100644 (file)
--- a/cinelerra-5.1/cinelerra/mainindexes.C
+++ b/cinelerra-5.1/cinelerra/mainindexes.C
@@ -109,6 +109,7 @@ void MainIndexes::stop_loop()
 
 void MainIndexes::start_build()
 {
 
 void MainIndexes::start_build()
 {

+       if( !current_indexables.size() ) return;

 //printf("MainIndexes::start_build 1\n");
        interrupt_flag = 0;
 // Locked up when indexes were already being built and an indexable was
 //printf("MainIndexes::start_build 1\n");
        interrupt_flag = 0;
 // Locked up when indexes were already being built and an indexable was

diff --git a/cinelerra-5.1/cinelerra/mainmenu.C b/cinelerra-5.1/cinelerra/mainmenu.C
index 8718915fdfffd7df1784374d67f4129f65da17de..bc12bed7d7e7ca95f9c4f3bf9a265892eb91c70a 100644 (file)
--- a/cinelerra-5.1/cinelerra/mainmenu.C
+++ b/cinelerra-5.1/cinelerra/mainmenu.C
@@ -203,7 +203,8 @@ void MainMenu::create_objects()
        trackmenu->add_item(new MoveTracksUp(mwindow));
        trackmenu->add_item(new MoveTracksDown(mwindow));
        trackmenu->add_item(new DeleteTracks(mwindow));
        trackmenu->add_item(new MoveTracksUp(mwindow));
        trackmenu->add_item(new MoveTracksDown(mwindow));
        trackmenu->add_item(new DeleteTracks(mwindow));

-       trackmenu->add_item(new DeleteTrack(mwindow));
+       trackmenu->add_item(new DeleteFirstTrack(mwindow));
+       trackmenu->add_item(new DeleteLastTrack(mwindow));

        trackmenu->add_item(new ConcatenateTracks(mwindow));
        AppendTracks *append_tracks;
        trackmenu->add_item(append_tracks = new AppendTracks(mwindow));
        trackmenu->add_item(new ConcatenateTracks(mwindow));
        AppendTracks *append_tracks;
        trackmenu->add_item(append_tracks = new AppendTracks(mwindow));


@@ -1221,23 +1222,42 @@ int DeleteTracks::handle_event()
        return 1;
 }
 
        return 1;
 }
 

-DeleteTrack::DeleteTrack(MWindow *mwindow)
+DeleteFirstTrack::DeleteFirstTrack(MWindow *mwindow)
+ : BC_MenuItem(_("Delete first track"), "Shift-D", 'D')
+{
+       set_shift(1);
+       this->mwindow = mwindow;
+}
+
+int DeleteFirstTrack::handle_event()
+{
+       if( mwindow->session->current_operation == NO_OPERATION ) {
+               Track *track = mwindow->edl->tracks->first;
+               if( track ) mwindow->delete_track(track);
+       }
+       return 1;
+}
+
+DeleteLastTrack::DeleteLastTrack(MWindow *mwindow)

  : BC_MenuItem(_("Delete last track"), "d", 'd')
 {
        this->mwindow = mwindow;
 }
 
  : BC_MenuItem(_("Delete last track"), "d", 'd')
 {
        this->mwindow = mwindow;
 }
 

-int DeleteTrack::handle_event()
+int DeleteLastTrack::handle_event()

 {
 {

-       if( mwindow->session->current_operation == NO_OPERATION )
-               mwindow->delete_track();
+       if( mwindow->session->current_operation == NO_OPERATION ) {
+               Track *track = mwindow->edl->tracks->last;
+               if( track ) mwindow->delete_track(track);
+       }

        return 1;
 }
 
 MoveTracksUp::MoveTracksUp(MWindow *mwindow)
  : BC_MenuItem(_("Move tracks up"), _("Shift-Up"), UP)
 {
        return 1;
 }
 
 MoveTracksUp::MoveTracksUp(MWindow *mwindow)
  : BC_MenuItem(_("Move tracks up"), _("Shift-Up"), UP)
 {

-       set_shift(); this->mwindow = mwindow;
+       this->mwindow = mwindow;
+       set_shift();

 }
 
 int MoveTracksUp::handle_event()
 }
 
 int MoveTracksUp::handle_event()

diff --git a/cinelerra-5.1/cinelerra/mainmenu.h b/cinelerra-5.1/cinelerra/mainmenu.h
index 674be023bd28787ee4659ea44e71060149f706c7..482cce3abcd9c64eabd2953206647749e07a6220 100644 (file)
--- a/cinelerra-5.1/cinelerra/mainmenu.h
+++ b/cinelerra-5.1/cinelerra/mainmenu.h
@@ -582,10 +582,18 @@ public:
        MWindow *mwindow;
 };
 
        MWindow *mwindow;
 };
 

-class DeleteTrack : public BC_MenuItem
+class DeleteFirstTrack : public BC_MenuItem

 {
 public:
 {
 public:

-       DeleteTrack(MWindow *mwindow);
+       DeleteFirstTrack(MWindow *mwindow);
+       int handle_event();
+       MWindow *mwindow;
+};
+
+class DeleteLastTrack : public BC_MenuItem
+{
+public:
+       DeleteLastTrack(MWindow *mwindow);

        int handle_event();
        MWindow *mwindow;
 };
        int handle_event();
        MWindow *mwindow;
 };

diff --git a/cinelerra-5.1/cinelerra/mainmenu.inc b/cinelerra-5.1/cinelerra/mainmenu.inc
index 6cf77201f37d7701b506b9002a2dc94b1d686bf4..f541463c9bd465994c7b45ee6718235da814321d 100644 (file)
--- a/cinelerra-5.1/cinelerra/mainmenu.inc
+++ b/cinelerra-5.1/cinelerra/mainmenu.inc
@@ -76,7 +76,8 @@ class MoveTracksUp;
 class MoveTracksDown;
 class DeleteTracks;
 class ConcatenateTracks;
 class MoveTracksDown;
 class DeleteTracks;
 class ConcatenateTracks;

-class DeleteTrack;
+class DeleteFirstTrack;
+class DeleteLastTrack;

 class LoopPlayback;
 class SetBRenderActive;
 class LabelsFollowEdits;
 class LoopPlayback;
 class SetBRenderActive;
 class LabelsFollowEdits;

diff --git a/cinelerra-5.1/cinelerra/mwindow.h b/cinelerra-5.1/cinelerra/mwindow.h
index be468ac9249c107e99fa2f3bab8f056e445f75e1..8a23118a25210e0a8a4897895d97c8a62e651b9a 100644 (file)
--- a/cinelerra-5.1/cinelerra/mwindow.h
+++ b/cinelerra-5.1/cinelerra/mwindow.h
@@ -365,7 +365,6 @@ public:
 // Calculate defaults path
        static void create_defaults_path(char *string, const char *config_file);
 
 // Calculate defaults path
        static void create_defaults_path(char *string, const char *config_file);
 

-       void delete_track();

        void delete_track(Track *track);
        void delete_tracks();
        int feather_edits(int64_t feather_samples, int audio, int video);
        void delete_track(Track *track);
        void delete_tracks();
        int feather_edits(int64_t feather_samples, int audio, int video);

diff --git a/cinelerra-5.1/cinelerra/mwindowedit.C b/cinelerra-5.1/cinelerra/mwindowedit.C
index bf5dc9177388679677bf9b01de192ff7497221d7..ebcaeb5109457310f75620c2ed57fe1406a90195 100644 (file)
--- a/cinelerra-5.1/cinelerra/mwindowedit.C
+++ b/cinelerra-5.1/cinelerra/mwindowedit.C
@@ -646,12 +646,6 @@ int MWindow::cut_default_keyframe()
 }
 
 
 }
 
 

-void MWindow::delete_track()
-{
-       if( edl->tracks->last )
-               delete_track(edl->tracks->last);
-}
-

 void MWindow::delete_tracks()
 {
        undo_before();
 void MWindow::delete_tracks()
 {
        undo_before();

diff --git a/cinelerra-5.1/cinelerra/pluginlv2.C b/cinelerra-5.1/cinelerra/pluginlv2.C
index f4f1f7946df4ce9bf77b35e5dea84aa298f900aa..d1c5a8c4022e7362ba613d70d94fed5b5e3a425d 100644 (file)
--- a/cinelerra-5.1/cinelerra/pluginlv2.C
+++ b/cinelerra-5.1/cinelerra/pluginlv2.C
@@ -167,16 +167,12 @@ int PluginLV2::init_lv2(PluginLV2ClientConfig &conf, int sample_rate, int bfrsz)
                }
        }
 
                }
        }
 

-
-       uri_map.callback_data = (LV2_URI_Map_Callback_Data)this;
-       uri_map.uri_to_id = uri_to_id;
-       features.append(new Lv2Feature(NS_EXT "uri-map", &uri_map));
-       map.handle = (void*)&uri_table;
-       map.map = uri_table_map;
-       features.append(new Lv2Feature(LV2_URID_MAP_URI, &map));
-       unmap.handle = (void*)&uri_table;
-       unmap.unmap  = uri_table_unmap;
-       features.append(new Lv2Feature(LV2_URID_UNMAP_URI, &unmap));
+       uri_map.handle = (LV2_URID_Map_Handle)this;
+       uri_map.map = map_uri;
+       features.append(new Lv2Feature(LV2_URID__map, &uri_map));
+       uri_unmap.handle = (LV2_URID_Unmap_Handle)this;
+       uri_unmap.unmap = unmap_uri;
+       features.append(new Lv2Feature(LV2_URID__unmap, &uri_unmap));

        features.append(new Lv2Feature(LV2_BUF_SIZE__powerOf2BlockLength, 0));
        features.append(new Lv2Feature(LV2_BUF_SIZE__fixedBlockLength,    0));
        features.append(new Lv2Feature(LV2_BUF_SIZE__boundedBlockLength,  0));
        features.append(new Lv2Feature(LV2_BUF_SIZE__powerOf2BlockLength, 0));
        features.append(new Lv2Feature(LV2_BUF_SIZE__fixedBlockLength,    0));
        features.append(new Lv2Feature(LV2_BUF_SIZE__boundedBlockLength,  0));


@@ -225,21 +221,16 @@ int PluginLV2::init_lv2(PluginLV2ClientConfig &conf, int sample_rate, int bfrsz)
        return 0;
 }
 
        return 0;
 }
 

-LV2_URID PluginLV2::uri_table_map(LV2_URID_Map_Handle handle, const char *uri)
-{
-       return ((PluginLV2UriTable *)handle)->map(uri);
-}
-
-const char *PluginLV2::uri_table_unmap(LV2_URID_Map_Handle handle, LV2_URID urid)
+uint32_t PluginLV2::map_uri(LV2_URID_Map_Handle handle, const char *uri)

 {
 {

-       return ((PluginLV2UriTable *)handle)->unmap(urid);
+       PluginLV2 *the = (PluginLV2 *)handle;
+       return the->uri_table.map(uri);

 }
 
 }
 

-uint32_t PluginLV2::uri_to_id(LV2_URI_Map_Callback_Data callback_data,
-       const char *map, const char *uri)
+const char *PluginLV2::unmap_uri(LV2_URID_Unmap_Handle handle, LV2_URID urid)

 {
 {

-       PluginLV2 *the = (PluginLV2 *)callback_data;
-       return the->map.map(the->uri_table, uri);
+       PluginLV2 *the = (PluginLV2 *)handle;
+       return the->uri_table.unmap(urid);

 }
 
 void PluginLV2::connect_ports(PluginLV2ClientConfig &conf, int ports)
 }
 
 void PluginLV2::connect_ports(PluginLV2ClientConfig &conf, int ports)


@@ -576,6 +567,7 @@ PluginLV2UI::PluginLV2UI()
        title[0] = 0;
 
        memset(&uri_map, 0, sizeof(uri_map));
        title[0] = 0;
 
        memset(&uri_map, 0, sizeof(uri_map));

+       memset(&uri_unmap, 0, sizeof(uri_unmap));

        memset(&extui_host, 0, sizeof(extui_host));
        wgt_type = LV2_EXTERNAL_UI_URI__KX__Widget;
        gtk_type = LV2_UI__GtkUI;
        memset(&extui_host, 0, sizeof(extui_host));
        wgt_type = LV2_EXTERNAL_UI_URI__KX__Widget;
        gtk_type = LV2_UI__GtkUI;

diff --git a/cinelerra-5.1/cinelerra/pluginlv2.h b/cinelerra-5.1/cinelerra/pluginlv2.h
index 913caed068b44e2fcf35616a2b0234a5575877c4..075816a70173fa9fa7c1438499a58c512f3c87a1 100644 (file)
--- a/cinelerra-5.1/cinelerra/pluginlv2.h
+++ b/cinelerra-5.1/cinelerra/pluginlv2.h
@@ -64,11 +64,10 @@ public:
        int load_lv2(const char *path,char *title=0);
        int init_lv2(PluginLV2ClientConfig &conf, int sample_rate, int bfrsz);
        virtual int is_forked() { return 0; }
        int load_lv2(const char *path,char *title=0);
        int init_lv2(PluginLV2ClientConfig &conf, int sample_rate, int bfrsz);
        virtual int is_forked() { return 0; }

-
-       static LV2_URID uri_table_map(LV2_URID_Map_Handle handle, const char *uri);
-       static const char *uri_table_unmap(LV2_URID_Map_Handle handle, LV2_URID urid);
-       static uint32_t uri_to_id(LV2_URI_Map_Callback_Data callback_data,
-                       const char *map, const char *uri);
+       static uint32_t map_uri(LV2_URID_Map_Handle handle, const char *uri);
+       static const char *unmap_uri(LV2_URID_Unmap_Handle handle, LV2_URID urid);
+       LV2_URID_Map uri_map;
+       LV2_URID_Unmap uri_unmap;

        void connect_ports(PluginLV2ClientConfig &conf, int ports);
        void del_buffer();
        void new_buffer(int64_t sz);
        void connect_ports(PluginLV2ClientConfig &conf, int ports);
        void del_buffer();
        void new_buffer(int64_t sz);


@@ -80,7 +79,6 @@ public:
        const LilvPlugin  *lilv;
        LilvUIs           *lilv_uis;
 
        const LilvPlugin  *lilv;
        LilvUIs           *lilv_uis;
 

-       LV2_URI_Map_Feature uri_map;

        PluginLV2UriTable  uri_table;
        LV2_URID_Map       map;
        LV2_Feature        map_feature;
        PluginLV2UriTable  uri_table;
        LV2_URID_Map       map;
        LV2_Feature        map_feature;

diff --git a/cinelerra-5.1/cinelerra/renderengine.C b/cinelerra-5.1/cinelerra/renderengine.C
index 25b8fbadf4eba14bc855b5a51353395ea80b7388..6bc828a37ad37bbd03f1daa72bbb449f677de00c 100644 (file)
--- a/cinelerra-5.1/cinelerra/renderengine.C
+++ b/cinelerra-5.1/cinelerra/renderengine.C
@@ -477,6 +477,7 @@ void RenderEngine::run()
                        position -= 1./command->get_edl()->session->frame_rate;
                        if( position < 0 ) position = 0;
                }
                        position -= 1./command->get_edl()->session->frame_rate;
                        if( position < 0 ) position = 0;
                }

+               playback_engine->command->command = STOP;

                playback_engine->is_playing_back = 0;
                playback_engine->tracking_position = position;
                playback_engine->stop_tracking();
                playback_engine->is_playing_back = 0;
                playback_engine->tracking_position = position;
                playback_engine->stop_tracking();

diff --git a/cinelerra-5.1/cinelerra/tracksedit.C b/cinelerra-5.1/cinelerra/tracksedit.C
index 5bda1f02f146ee862290a2c397ab59dcace39ec1..9cc095bff2de024210a239742aff9ab23cbb936d 100644 (file)
--- a/cinelerra-5.1/cinelerra/tracksedit.C
+++ b/cinelerra-5.1/cinelerra/tracksedit.C
@@ -851,24 +851,15 @@ int Tracks::move_track_down(Track *track)
 
 int Tracks::move_tracks_up()
 {
 
 int Tracks::move_tracks_up()
 {

-       Track *track, *next_track;

        int result = 0;
        int result = 0;

-
-       for(track = first;
-               track;
-               track = next_track)
-       {
-               next_track = track->next;
-
-               if(track->record)
-               {
-                       if(track->previous)
-                       {
-                               change_modules(number_of(track->previous), number_of(track), 1);
-
-                               swap(track->previous, track);
-                               result = 1;
-                       }
+       Track *next = first;
+       while( next ) {
+               Track *track = next;  next = track->next;
+               if( !track->record ) continue;
+               if( track->previous ) {
+                       change_modules(number_of(track->previous), number_of(track), 1);
+                       swap(track->previous, track);
+                       result = 1;

                }
        }
 
                }
        }
 


@@ -877,24 +868,15 @@ int Tracks::move_tracks_up()
 
 int Tracks::move_tracks_down()
 {
 
 int Tracks::move_tracks_down()
 {

-       Track *track, *previous_track;

        int result = 0;
        int result = 0;

-
-       for(track = last;
-               track;
-               track = previous_track)
-       {
-               previous_track = track->previous;
-
-               if(track->record)
-               {
-                       if(track->next)
-                       {
-                               change_modules(number_of(track), number_of(track->next), 1);
-
-                               swap(track, track->next);
-                               result = 1;
-                       }
+       Track *prev = last;
+       while( prev ) {
+               Track *track = prev;  prev = track->previous;
+               if( !track->record ) continue;
+               if( track->next ) {
+                       change_modules(number_of(track), number_of(track->next), 1);
+                       swap(track, track->next);
+                       result = 1;

                }
        }
 
                }
        }
 


@@ -902,7 +884,6 @@ int Tracks::move_tracks_down()
 }
 
 
 }
 
 

-

 void Tracks::paste_audio_transition(PluginServer *server)
 {
        for(Track *current = first; current; current = NEXT)
 void Tracks::paste_audio_transition(PluginServer *server)
 {
        for(Track *current = first; current; current = NEXT)

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 9305fe2c7d367c7f3e26677dc95fc7496f2e71a2..71799d99a489ea77c82aeecc81506dd64d5de28a 100644 (file)
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -366,37 +366,37 @@ PKG_3RD([x265],[auto],
   [ . source ])
 
 PKG_3RD([libvpx],[auto],
   [ . source ])
 
 PKG_3RD([libvpx],[auto],

-  [libvpx-1.7.0],
+  [libvpx-1.8.0],

   [ libvpx.a ],
   [ . ])
 
 PKG_3RD([lv2],[auto],
   [ libvpx.a ],
   [ . ])
 
 PKG_3RD([lv2],[auto],

-  [lv2-1.14.0],
+  [lv2-1.16.0],

   [ ],
   [ usr/local/include usr/local/lib64/lv2 usr/local/lib/lv2 ])
 
 PKG_3RD([sratom],[auto],
   [ ],
   [ usr/local/include usr/local/lib64/lv2 usr/local/lib/lv2 ])
 
 PKG_3RD([sratom],[auto],

-  [sratom-0.6.0],
+  [sratom-0.6.2],

   [ usr/local/lib/libsratom-0.a ],
   [ usr/local/include ])
 
 PKG_3RD([serd],[auto],
   [ usr/local/lib/libsratom-0.a ],
   [ usr/local/include ])
 
 PKG_3RD([serd],[auto],

-  [serd-0.28.0],
+  [serd-0.30.0],

   [ usr/local/lib/libserd-0.a ],
   [ usr/local/include ])
 
 PKG_3RD([sord],[auto],
   [ usr/local/lib/libserd-0.a ],
   [ usr/local/include ])
 
 PKG_3RD([sord],[auto],

-  [sord-0.16.0],
+  [sord-0.16.2],

   [ usr/local/lib/libsord-0.a ],
   [ usr/local/include ])
 
 PKG_3RD([lilv],[auto],
   [ usr/local/lib/libsord-0.a ],
   [ usr/local/include ])
 
 PKG_3RD([lilv],[auto],

-  [lilv-0.24.2],
+  [lilv-0.24.4],

   [ usr/local/lib/liblilv-0.a ],
   [ usr/local/include ])
 
 PKG_3RD([suil],[auto],
   [ usr/local/lib/liblilv-0.a ],
   [ usr/local/include ])
 
 PKG_3RD([suil],[auto],

-  [suil-0.8.4],
+  [suil-0.10.2],

   [ usr/local/lib/libsuil-0.a ],
   [ usr/local/include ])
 
   [ usr/local/lib/libsuil-0.a ],
   [ usr/local/include ])
 

diff --git a/cinelerra-5.1/msg/txt b/cinelerra-5.1/msg/txt
index 536451adc911fe46adfa722b40f708c73daf0107..1e782bc587adcf08e63f922a3acd845ec921ae9b 100644 (file)
--- a/cinelerra-5.1/msg/txt
+++ b/cinelerra-5.1/msg/txt
@@ -1,7 +1,3 @@
-Cinelerra-GG Infinity continuously merged/enriched from the
-  original Heroine Virtual of Adam Williams which does not
-  support many modern formats, and now contains CV mods
-  provided over prior years from the Community Version.

 Email cin@lists.cinelerra-gg.org 4 help.
 For usage help, refer to the following:
   https://cinelerra-gg.org/downloads/CinelerraGG_manual.pdf
 Email cin@lists.cinelerra-gg.org 4 help.
 For usage help, refer to the following:
   https://cinelerra-gg.org/downloads/CinelerraGG_manual.pdf

diff --git a/cinelerra-5.1/thirdparty/downloads.txt b/cinelerra-5.1/thirdparty/downloads.txt
index 3a73171a23c8a75dd54770eae0e83d5473fa4194..b998f81423e7b39d596fefada66ee0e0255c3bfd 100644 (file)
--- a/cinelerra-5.1/thirdparty/downloads.txt
+++ b/cinelerra-5.1/thirdparty/downloads.txt
@@ -36,3 +36,11 @@ https://github.com/swh/ladspa/releases/tag/v0.4.17, plugin.org.uk
 https://archive.mozilla.org/pub/opus/opus-1.3.tar.gz
 https://github.com/webmproject/libwebp = libwebp-1.0.2
 https://github.com/mozilla/aom = libaom-v1.0.0
 https://archive.mozilla.org/pub/opus/opus-1.3.tar.gz
 https://github.com/webmproject/libwebp = libwebp-1.0.2
 https://github.com/mozilla/aom = libaom-v1.0.0

+
+https://gitlab.com/drobilla/lv2/-/archive/v1.16.0/lv2-v1.16.0.tar.gz
+http://download.drobilla.net/suil-0.10.2.tar.bz2
+http://download.drobilla.net/sratom-0.6.2.tar.bz2
+http://download.drobilla.net/lilv-0.24.4.tar.bz2
+http://download.drobilla.net/sord-0.16.2.tar.bz2
+http://download.drobilla.net/serd-0.30.0.tar.bz2
+http://download.drobilla.net/jalv-1.6.0.tar.bz2

diff --git a/cinelerra-5.1/thirdparty/src/jalv-1.6.0.tar.xz b/cinelerra-5.1/thirdparty/src/jalv-1.6.0.tar.xz
new file mode 100644 (file)
index 0000000..86daab2
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/jalv-1.6.0.tar.xz differ

diff --git a/cinelerra-5.1/thirdparty/src/libvpx-1.7.0.tar.xz b/cinelerra-5.1/thirdparty/src/libvpx-1.7.0.tar.xz
deleted file mode 100644 (file)
index dbf89b3..0000000
Binary files a/cinelerra-5.1/thirdparty/src/libvpx-1.7.0.tar.xz and /dev/null differ

diff --git a/cinelerra-5.1/thirdparty/src/libvpx-1.8.0.tar.xz b/cinelerra-5.1/thirdparty/src/libvpx-1.8.0.tar.xz
new file mode 100644 (file)
index 0000000..eaee04c
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/libvpx-1.8.0.tar.xz differ

diff --git a/cinelerra-5.1/thirdparty/src/lilv-0.24.2.tar.xz b/cinelerra-5.1/thirdparty/src/lilv-0.24.2.tar.xz
deleted file mode 100644 (file)
index 58f4fc1..0000000
Binary files a/cinelerra-5.1/thirdparty/src/lilv-0.24.2.tar.xz and /dev/null differ

diff --git a/cinelerra-5.1/thirdparty/src/lilv-0.24.4.tar.xz b/cinelerra-5.1/thirdparty/src/lilv-0.24.4.tar.xz
new file mode 100644 (file)
index 0000000..2769d4f
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/lilv-0.24.4.tar.xz differ

diff --git a/cinelerra-5.1/thirdparty/src/lv2-1.14.0.tar.xz b/cinelerra-5.1/thirdparty/src/lv2-1.14.0.tar.xz
deleted file mode 100644 (file)
index 1622ec3..0000000
Binary files a/cinelerra-5.1/thirdparty/src/lv2-1.14.0.tar.xz and /dev/null differ

diff --git a/cinelerra-5.1/thirdparty/src/lv2-1.16.0.tar.xz b/cinelerra-5.1/thirdparty/src/lv2-1.16.0.tar.xz
new file mode 100644 (file)
index 0000000..9b57f63
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/lv2-1.16.0.tar.xz differ

diff --git a/cinelerra-5.1/thirdparty/src/serd-0.28.0.tar.xz b/cinelerra-5.1/thirdparty/src/serd-0.28.0.tar.xz
deleted file mode 100644 (file)
index 23408e5..0000000
Binary files a/cinelerra-5.1/thirdparty/src/serd-0.28.0.tar.xz and /dev/null differ

diff --git a/cinelerra-5.1/thirdparty/src/serd-0.30.0.tar.xz b/cinelerra-5.1/thirdparty/src/serd-0.30.0.tar.xz
new file mode 100644 (file)
index 0000000..ca9721a
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/serd-0.30.0.tar.xz differ

diff --git a/cinelerra-5.1/thirdparty/src/sord-0.16.0.tar.xz b/cinelerra-5.1/thirdparty/src/sord-0.16.0.tar.xz
deleted file mode 100644 (file)
index 31f97f8..0000000
Binary files a/cinelerra-5.1/thirdparty/src/sord-0.16.0.tar.xz and /dev/null differ

diff --git a/cinelerra-5.1/thirdparty/src/sord-0.16.2.tar.xz b/cinelerra-5.1/thirdparty/src/sord-0.16.2.tar.xz
new file mode 100644 (file)
index 0000000..5793b2c
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/sord-0.16.2.tar.xz differ

diff --git a/cinelerra-5.1/thirdparty/src/sratom-0.6.0.tar.xz b/cinelerra-5.1/thirdparty/src/sratom-0.6.0.tar.xz
deleted file mode 100644 (file)
index de31f0c..0000000
Binary files a/cinelerra-5.1/thirdparty/src/sratom-0.6.0.tar.xz and /dev/null differ

diff --git a/cinelerra-5.1/thirdparty/src/sratom-0.6.2.tar.xz b/cinelerra-5.1/thirdparty/src/sratom-0.6.2.tar.xz
new file mode 100644 (file)
index 0000000..a56b403
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/sratom-0.6.2.tar.xz differ

diff --git a/cinelerra-5.1/thirdparty/src/suil-0.10.2.tar.xz b/cinelerra-5.1/thirdparty/src/suil-0.10.2.tar.xz
new file mode 100644 (file)
index 0000000..3bf2d55
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/suil-0.10.2.tar.xz differ

diff --git a/cinelerra-5.1/thirdparty/src/suil-0.8.4.tar.xz b/cinelerra-5.1/thirdparty/src/suil-0.8.4.tar.xz
deleted file mode 100644 (file)
index efe8acf..0000000
Binary files a/cinelerra-5.1/thirdparty/src/suil-0.8.4.tar.xz and /dev/null differ