Cleanup: Use BKE_ prefix for all public functions exposed by the NLA module
authorJoshua Leung <aligorith@gmail.com>
Thu, 8 Mar 2018 04:14:46 +0000 (17:14 +1300)
committerJoshua Leung <aligorith@gmail.com>
Thu, 8 Mar 2018 04:15:34 +0000 (17:15 +1300)
12 files changed:
source/blender/blenkernel/BKE_nla.h
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/ipo.c
source/blender/blenkernel/intern/nla.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_edit.c
source/blender/editors/space_action/action_data.c
source/blender/editors/space_nla/nla_channels.c
source/blender/editors/space_nla/nla_edit.c
source/blender/editors/transform/transform_generics.c
source/blender/makesrna/intern/rna_animation.c
source/blender/makesrna/intern/rna_nla.c

index 8d9fc8ff6cf0c45f3365f67ca666000f15b36838..4509d374b02f8a0040c538c1cf460ba484ce1f62 100644 (file)
@@ -46,18 +46,18 @@ struct PropertyRNA;
 /* ----------------------------- */
 /* Data Management */
 
-void free_nlastrip(ListBase *strips, struct NlaStrip *strip);
-void free_nlatrack(ListBase *tracks, struct NlaTrack *nlt);
-void free_nladata(ListBase *tracks);
-
-struct NlaStrip *copy_nlastrip(struct NlaStrip *strip, const bool use_same_action);
-struct NlaTrack *copy_nlatrack(struct NlaTrack *nlt, const bool use_same_actions);
-void copy_nladata(ListBase *dst, ListBase *src);
-
-struct NlaTrack *add_nlatrack(struct AnimData *adt, struct NlaTrack *prev);
-struct NlaStrip *add_nlastrip(struct bAction *act);
-struct NlaStrip *add_nlastrip_to_stack(struct AnimData *adt, struct bAction *act);
-struct NlaStrip *add_nla_soundstrip(struct Scene *scene, struct Speaker *spk);
+void BKE_nlastrip_free(ListBase *strips, struct NlaStrip *strip);
+void BKE_nlatrack_free(ListBase *tracks, struct NlaTrack *nlt);
+void BKE_nla_tracks_free(ListBase *tracks);
+
+struct NlaStrip *BKE_nlastrip_copy(struct NlaStrip *strip, const bool use_same_action);
+struct NlaTrack *BKE_nlatrack_copy(struct NlaTrack *nlt, const bool use_same_actions);
+void BKE_nla_tracks_copy(ListBase *dst, ListBase *src);
+
+struct NlaTrack *BKE_nlatrack_add(struct AnimData *adt, struct NlaTrack *prev);
+struct NlaStrip *BKE_nlastrip_new(struct bAction *act);
+struct NlaStrip *BKE_nlastack_add_strip(struct AnimData *adt, struct bAction *act);
+struct NlaStrip *BKE_nla_add_soundstrip(struct Scene *scene, struct Speaker *spk);
 
 /* ----------------------------- */
 /* API */
index 95d9a769749092ebc95165ff763d913be7a4e6bb..095ef6fa1bdf4a76784c91fd4f3d7895b2142b92 100644 (file)
@@ -243,7 +243,7 @@ void BKE_animdata_free(ID *id, const bool do_id_user)
                        }
                                
                        /* free nla data */
-                       free_nladata(&adt->nla_tracks);
+                       BKE_nla_tracks_free(&adt->nla_tracks);
                        
                        /* free drivers - stored as a list of F-Curves */
                        free_fcurves(&adt->drivers);
@@ -282,7 +282,7 @@ AnimData *BKE_animdata_copy(Main *bmain, AnimData *adt, const bool do_action)
        }
 
        /* duplicate NLA data */
-       copy_nladata(&dadt->nla_tracks, &adt->nla_tracks);
+       BKE_nla_tracks_copy(&dadt->nla_tracks, &adt->nla_tracks);
        
        /* duplicate drivers (F-Curves) */
        copy_fcurves(&dadt->drivers, &adt->drivers);
@@ -364,7 +364,7 @@ void BKE_animdata_merge_copy(ID *dst_id, ID *src_id, eAnimData_MergeCopy_Modes a
        if (src->nla_tracks.first) {
                ListBase tracks = {NULL, NULL};
                
-               copy_nladata(&tracks, &src->nla_tracks);
+               BKE_nla_tracks_copy(&tracks, &src->nla_tracks);
                BLI_movelisttolist(&dst->nla_tracks, &tracks);
        }
        
index 00cf40f06cdf7122c22ebffe826f0a19fb6bec12..fcbc25ebad58ded12db429687f0c06037615c624 100644 (file)
@@ -1663,7 +1663,7 @@ static void nlastrips_to_animdata(ID *id, ListBase *strips)
                                /* trying to add to the current failed (no space), 
                                 * so add a new track to the stack, and add to that...
                                 */
-                               nlt = add_nlatrack(adt, NULL);
+                               nlt = BKE_nlatrack_add(adt, NULL);
                                BKE_nlatrack_add_strip(nlt, strip);
                        }
                        
index 6a0effd5ed261e4ccd79d81c0db2679038ae40e0..e239037df7047bd751088e1eceebd58ad04d7e54 100644 (file)
@@ -75,7 +75,7 @@
 /* Remove the given NLA strip from the NLA track it occupies, free the strip's data,
  * and the strip itself. 
  */
-void free_nlastrip(ListBase *strips, NlaStrip *strip)
+void BKE_nlastrip_free(ListBase *strips, NlaStrip *strip)
 {
        NlaStrip *cs, *csn;
        
@@ -86,7 +86,7 @@ void free_nlastrip(ListBase *strips, NlaStrip *strip)
        /* free child-strips */
        for (cs = strip->strips.first; cs; cs = csn) {
                csn = cs->next;
-               free_nlastrip(&strip->strips, cs);
+               BKE_nlastrip_free(&strip->strips, cs);
        }
                
        /* remove reference to action */
@@ -113,7 +113,7 @@ void free_nlastrip(ListBase *strips, NlaStrip *strip)
 /* Remove the given NLA track from the set of NLA tracks, free the track's data,
  * and the track itself.
  */
-void free_nlatrack(ListBase *tracks, NlaTrack *nlt)
+void BKE_nlatrack_free(ListBase *tracks, NlaTrack *nlt)
 {
        NlaStrip *strip, *stripn;
        
@@ -124,7 +124,7 @@ void free_nlatrack(ListBase *tracks, NlaTrack *nlt)
        /* free strips */
        for (strip = nlt->strips.first; strip; strip = stripn) {
                stripn = strip->next;
-               free_nlastrip(&nlt->strips, strip);
+               BKE_nlastrip_free(&nlt->strips, strip);
        }
        
        /* free NLA track itself now */
@@ -137,7 +137,7 @@ void free_nlatrack(ListBase *tracks, NlaTrack *nlt)
 /* Free the elements of type NLA Tracks provided in the given list, but do not free
  * the list itself since that is not free-standing
  */
-void free_nladata(ListBase *tracks)
+void BKE_nla_tracks_free(ListBase *tracks)
 {
        NlaTrack *nlt, *nltn;
        
@@ -148,7 +148,7 @@ void free_nladata(ListBase *tracks)
        /* free tracks one by one */
        for (nlt = tracks->first; nlt; nlt = nltn) {
                nltn = nlt->next;
-               free_nlatrack(tracks, nlt);
+               BKE_nlatrack_free(tracks, nlt);
        }
        
        /* clear the list's pointers to be safe */
@@ -162,7 +162,7 @@ void free_nladata(ListBase *tracks)
  *
  * \param use_same_action When true, the existing action is used (instead of being duplicated)
  */
-NlaStrip *copy_nlastrip(NlaStrip *strip, const bool use_same_action)
+NlaStrip *BKE_nlastrip_copy(NlaStrip *strip, const bool use_same_action)
 {
        NlaStrip *strip_d;
        NlaStrip *cs, *cs_d;
@@ -195,7 +195,7 @@ NlaStrip *copy_nlastrip(NlaStrip *strip, const bool use_same_action)
        BLI_listbase_clear(&strip_d->strips);
        
        for (cs = strip->strips.first; cs; cs = cs->next) {
-               cs_d = copy_nlastrip(cs, use_same_action);
+               cs_d = BKE_nlastrip_copy(cs, use_same_action);
                BLI_addtail(&strip_d->strips, cs_d);
        }
        
@@ -204,7 +204,7 @@ NlaStrip *copy_nlastrip(NlaStrip *strip, const bool use_same_action)
 }
 
 /* Copy NLA Track */
-NlaTrack *copy_nlatrack(NlaTrack *nlt, const bool use_same_actions)
+NlaTrack *BKE_nlatrack_copy(NlaTrack *nlt, const bool use_same_actions)
 {
        NlaStrip *strip, *strip_d;
        NlaTrack *nlt_d;
@@ -221,7 +221,7 @@ NlaTrack *copy_nlatrack(NlaTrack *nlt, const bool use_same_actions)
        BLI_listbase_clear(&nlt_d->strips);
        
        for (strip = nlt->strips.first; strip; strip = strip->next) {
-               strip_d = copy_nlastrip(strip, use_same_actions);
+               strip_d = BKE_nlastrip_copy(strip, use_same_actions);
                BLI_addtail(&nlt_d->strips, strip_d);
        }
        
@@ -230,7 +230,7 @@ NlaTrack *copy_nlatrack(NlaTrack *nlt, const bool use_same_actions)
 }
 
 /* Copy all NLA data */
-void copy_nladata(ListBase *dst, ListBase *src)
+void BKE_nla_tracks_copy(ListBase *dst, ListBase *src)
 {
        NlaTrack *nlt, *nlt_d;
        
@@ -245,7 +245,7 @@ void copy_nladata(ListBase *dst, ListBase *src)
        for (nlt = src->first; nlt; nlt = nlt->next) {
                /* make a copy, and add the copy to the destination list */
                // XXX: we need to fix this sometime
-               nlt_d = copy_nlatrack(nlt, true);
+               nlt_d = BKE_nlatrack_copy(nlt, true);
                BLI_addtail(dst, nlt_d);
        }
 }
@@ -255,7 +255,7 @@ void copy_nladata(ListBase *dst, ListBase *src)
 /* Add a NLA Track to the given AnimData 
  *     - prev: NLA-Track to add the new one after
  */
-NlaTrack *add_nlatrack(AnimData *adt, NlaTrack *prev)
+NlaTrack *BKE_nlatrack_add(AnimData *adt, NlaTrack *prev)
 {
        NlaTrack *nlt;
        
@@ -285,8 +285,8 @@ NlaTrack *add_nlatrack(AnimData *adt, NlaTrack *prev)
        return nlt;
 }
 
-/* Add a NLA Strip referencing the given Action */
-NlaStrip *add_nlastrip(bAction *act)
+/* Create a NLA Strip referencing the given Action */
+NlaStrip *BKE_nlastrip_new(bAction *act)
 {
        NlaStrip *strip;
        
@@ -327,7 +327,7 @@ NlaStrip *add_nlastrip(bAction *act)
 }
 
 /* Add new NLA-strip to the top of the NLA stack - i.e. into the last track if space, or a new one otherwise */
-NlaStrip *add_nlastrip_to_stack(AnimData *adt, bAction *act)
+NlaStrip *BKE_nlastack_add_strip(AnimData *adt, bAction *act)
 {
        NlaStrip *strip;
        NlaTrack *nlt;
@@ -337,7 +337,7 @@ NlaStrip *add_nlastrip_to_stack(AnimData *adt, bAction *act)
                return NULL;
        
        /* create a new NLA strip */
-       strip = add_nlastrip(act);
+       strip = BKE_nlastrip_new(act);
        if (strip == NULL)
                return NULL;
        
@@ -346,7 +346,7 @@ NlaStrip *add_nlastrip_to_stack(AnimData *adt, bAction *act)
                /* trying to add to the last track failed (no track or no space), 
                 * so add a new track to the stack, and add to that...
                 */
-               nlt = add_nlatrack(adt, NULL);
+               nlt = BKE_nlatrack_add(adt, NULL);
                BKE_nlatrack_add_strip(nlt, strip);
        }
        
@@ -358,7 +358,7 @@ NlaStrip *add_nlastrip_to_stack(AnimData *adt, bAction *act)
 }
 
 /* Add a NLA Strip referencing the given speaker's sound */
-NlaStrip *add_nla_soundstrip(Scene *scene, Speaker *speaker)
+NlaStrip *BKE_nla_add_soundstrip(Scene *scene, Speaker *speaker)
 {
        NlaStrip *strip = MEM_callocN(sizeof(NlaStrip), "NlaSoundStrip");
        
@@ -751,7 +751,7 @@ void BKE_nlastrips_clear_metastrip(ListBase *strips, NlaStrip *strip)
        }
        
        /* free the meta-strip now */
-       free_nlastrip(strips, strip);
+       BKE_nlastrip_free(strips, strip);
 }
 
 /* Remove meta-strips (i.e. flatten the list of strips) from the top-level of the list of strips
@@ -1714,7 +1714,7 @@ bool BKE_nla_action_stash(AnimData *adt)
                }
        }
        
-       nlt = add_nlatrack(adt, prev_track);
+       nlt = BKE_nlatrack_add(adt, prev_track);
        BLI_assert(nlt != NULL);
        
        /* we need to ensure that if there wasn't any previous instance, it must go to tbe bottom of the stack */
@@ -1729,7 +1729,7 @@ bool BKE_nla_action_stash(AnimData *adt)
        /* add the action as a strip in this new track
         * NOTE: a new user is created here
         */
-       strip = add_nlastrip(adt->action);
+       strip = BKE_nlastrip_new(adt->action);
        BLI_assert(strip != NULL);
        
        BKE_nlatrack_add_strip(nlt, strip);
@@ -1782,7 +1782,7 @@ void BKE_nla_action_pushdown(AnimData *adt)
        }
        
        /* add a new NLA strip to the track, which references the active action */
-       strip = add_nlastrip_to_stack(adt, adt->action);
+       strip = BKE_nlastack_add_strip(adt, adt->action);
        
        /* do other necessary work on strip */
        if (strip) {
index 8d5c4684c2b92b070b11da12f2cae394cb070418..0b486f8e5a30fad325178d4fc338677b69df0a89 100644 (file)
@@ -1059,8 +1059,8 @@ static int object_speaker_add_exec(bContext *C, wmOperator *op)
        {
                /* create new data for NLA hierarchy */
                AnimData *adt = BKE_animdata_add_id(&ob->id);
-               NlaTrack *nlt = add_nlatrack(adt, NULL);
-               NlaStrip *strip = add_nla_soundstrip(scene, ob->data);
+               NlaTrack *nlt = BKE_nlatrack_add(adt, NULL);
+               NlaStrip *strip = BKE_nla_add_soundstrip(scene, ob->data);
                strip->start = CFRA;
                strip->end += strip->start;
 
index 84808817b94be36ade06b936cfa262bb0baec3dc..32f0f1f9bec0ec351982ecb0656bbb623e4a348e 100644 (file)
@@ -1096,7 +1096,7 @@ static void copy_attr(Main *bmain, Scene *scene, View3D *v3d, short event)
                                }
                                else if (event == 26) {
 #if 0 // XXX old animation system
-                                       copy_nlastrips(&base->object->nlastrips, &ob->nlastrips);
+                                       BKE_nlastrip_copy(s(&base->object->nlastrips, &ob->nlastrips);
 #endif // XXX old animation system
                                }
                                else if (event == 27) {   /* autosmooth */
index 29b3c6f2f6cec3247610fe8bcb9fd094fc234ace..fbef14c07c48ee389c65ff852d863be6f27d4eb1 100644 (file)
@@ -568,11 +568,11 @@ void ED_animedit_unlink_action(bContext *C, ID *id, AnimData *adt, bAction *act,
                                                
                                                if (strip->act == act) {
                                                        /* Remove this strip, and the track too if it doesn't have anything else */
-                                                       free_nlastrip(&nlt->strips, strip);
+                                                       BKE_nlastrip_free(&nlt->strips, strip);
                                                        
                                                        if (nlt->strips.first == NULL) {
                                                                BLI_assert(nstrip == NULL);
-                                                               free_nlatrack(&adt->nla_tracks, nlt);
+                                                               BKE_nlatrack_free(&adt->nla_tracks, nlt);
                                                        }
                                                }
                                        }
index c261821db16a7c0bbab4abbab7c385421dce215a..27f275c15dddac993b31a109e27a69c5439476e4 100644 (file)
@@ -596,12 +596,12 @@ bool nlaedit_add_tracks_existing(bAnimContext *ac, bool above_sel)
                         */
                        if (above_sel) {
                                /* just add a new one above this one */
-                               add_nlatrack(adt, nlt);
+                               BKE_nlatrack_add(adt, nlt);
                                added = true;
                        }
                        else if ((lastAdt == NULL) || (adt != lastAdt)) {
                                /* add one track to the top of the owning AnimData's stack, then don't add anymore to this stack */
-                               add_nlatrack(adt, NULL);
+                               BKE_nlatrack_add(adt, NULL);
                                lastAdt = adt;
                                added = true;
                        }
@@ -636,7 +636,7 @@ bool nlaedit_add_tracks_empty(bAnimContext *ac)
                /* ensure it is empty */
                if (BLI_listbase_is_empty(&adt->nla_tracks)) {
                        /* add new track to this AnimData block then */
-                       add_nlatrack(adt, NULL);
+                       BKE_nlatrack_add(adt, NULL);
                        added = true;
                }
        }
@@ -731,7 +731,7 @@ static int nlaedit_delete_tracks_exec(bContext *C, wmOperator *UNUSED(op))
                                adt->flag &= ~ADT_NLA_SOLO_TRACK;
                        
                        /* call delete on this track - deletes all strips too */
-                       free_nlatrack(&adt->nla_tracks, nlt);
+                       BKE_nlatrack_free(&adt->nla_tracks, nlt);
                }
        }
        
index 31524f8450afe2621668d0f26d1bbafd421cc9e6..87b7599ec6634edce19aca7155e27981ff8700ea 100644 (file)
@@ -645,7 +645,7 @@ static int nlaedit_add_actionclip_exec(bContext *C, wmOperator *op)
                }
                
                /* create a new strip, and offset it to start on the current frame */
-               strip = add_nlastrip(act);
+               strip = BKE_nlastrip_new(act);
                
                strip->end      += (cfra - strip->start);
                strip->start     = cfra;
@@ -655,7 +655,7 @@ static int nlaedit_add_actionclip_exec(bContext *C, wmOperator *op)
                        /* trying to add to the current failed (no space), 
                         * so add a new track to the stack, and add to that...
                         */
-                       nlt = add_nlatrack(adt, NULL);
+                       nlt = BKE_nlatrack_add(adt, NULL);
                        BKE_nlatrack_add_strip(nlt, strip);
                }
                
@@ -858,7 +858,7 @@ static int nlaedit_add_sound_exec(bContext *C, wmOperator *UNUSED(op))
                        continue;
                        
                /* create a new strip, and offset it to start on the current frame */
-               strip = add_nla_soundstrip(ac.scene, ob->data);
+               strip = BKE_nla_add_soundstrip(ac.scene, ob->data);
                
                strip->start += cfra;
                strip->end   += cfra;
@@ -868,7 +868,7 @@ static int nlaedit_add_sound_exec(bContext *C, wmOperator *UNUSED(op))
                        /* trying to add to the current failed (no space), 
                         * so add a new track to the stack, and add to that...
                         */
-                       nlt = add_nlatrack(adt, NULL);
+                       nlt = BKE_nlatrack_add(adt, NULL);
                        BKE_nlatrack_add_strip(nlt, strip);
                }
                
@@ -1057,7 +1057,7 @@ static int nlaedit_duplicate_exec(bContext *C, wmOperator *op)
                        /* if selected, split the strip at its midpoint */
                        if (strip->flag & NLASTRIP_FLAG_SELECT) {
                                /* make a copy (assume that this is possible) */
-                               nstrip = copy_nlastrip(strip, linked);
+                               nstrip = BKE_nlastrip_copy(strip, linked);
                                
                                /* in case there's no space in the track above, or we haven't got a reference to it yet, try adding */
                                if (BKE_nlatrack_add_strip(nlt->next, nstrip) == 0) {
@@ -1065,7 +1065,7 @@ static int nlaedit_duplicate_exec(bContext *C, wmOperator *op)
                                         *      - if the current one is the last one, nlt->next will be NULL, which defaults to adding 
                                         *        at the top of the stack anyway...
                                         */
-                                       track = add_nlatrack(adt, nlt->next);
+                                       track = BKE_nlatrack_add(adt, nlt->next);
                                        BKE_nlatrack_add_strip(track, nstrip);
                                }
                                
@@ -1160,14 +1160,14 @@ static int nlaedit_delete_exec(bContext *C, wmOperator *UNUSED(op))
                        if (strip->flag & NLASTRIP_FLAG_SELECT) {
                                /* if a strip either side of this was a transition, delete those too */
                                if ((strip->prev) && (strip->prev->type == NLASTRIP_TYPE_TRANSITION)) 
-                                       free_nlastrip(&nlt->strips, strip->prev);
+                                       BKE_nlastrip_free(&nlt->strips, strip->prev);
                                if ((nstrip) && (nstrip->type == NLASTRIP_TYPE_TRANSITION)) {
                                        nstrip = nstrip->next;
-                                       free_nlastrip(&nlt->strips, strip->next);
+                                       BKE_nlastrip_free(&nlt->strips, strip->next);
                                }
                                
                                /* finally, delete this strip */
-                               free_nlastrip(&nlt->strips, strip);
+                               BKE_nlastrip_free(&nlt->strips, strip);
                        }
                }
        }
@@ -1242,7 +1242,7 @@ static void nlaedit_split_strip_actclip(AnimData *adt, NlaTrack *nlt, NlaStrip *
        /* make a copy (assume that this is possible) and append
         * it immediately after the current strip
         */
-       nstrip = copy_nlastrip(strip, true);
+       nstrip = BKE_nlastrip_copy(strip, true);
        BLI_insertlinkafter(&nlt->strips, strip, nstrip);
        
        /* set the endpoint of the first strip and the start of the new strip 
@@ -2186,7 +2186,7 @@ static int nlaedit_snap_exec(bContext *C, wmOperator *op)
                        /* in case there's no space in the current track, try adding */
                        if (BKE_nlatrack_add_strip(nlt, strip) == 0) {
                                /* need to add a new track above the current one */
-                               track = add_nlatrack(adt, nlt);
+                               track = BKE_nlatrack_add(adt, nlt);
                                BKE_nlatrack_add_strip(track, strip);
                                
                                /* clear temp meta-strips on this new track, as we may not be able to get back to it */
index 277e01d1e2bd74e9a8919a93b3318cff8ede8006..618b8a3732058d36f685d01977e32a4b5c15e37f 100644 (file)
@@ -276,7 +276,7 @@ static void animrecord_check_state(Scene *scene, ID *id, wmTimer *animtimer)
                                /* only push down if action is more than 1-2 frames long */
                                calc_action_range(adt->action, &astart, &aend, 1);
                                if (aend > astart + 2.0f) {
-                                       NlaStrip *strip = add_nlastrip_to_stack(adt, adt->action);
+                                       NlaStrip *strip = BKE_nlastack_add_strip(adt, adt->action);
                                        
                                        /* clear reference to action now that we've pushed it onto the stack */
                                        id_us_min(&adt->action->id);
index c9c8a791545346639fb3f06061eaac09f2632761..6779e74700d0973794d0d912f2a1a3cc7284fa0d 100644 (file)
@@ -519,7 +519,7 @@ static void rna_KeyingSet_paths_clear(KeyingSet *keyingset, ReportList *reports)
 /* needs wrapper function to push notifier */
 static NlaTrack *rna_NlaTrack_new(AnimData *adt, bContext *C, NlaTrack *track)
 {
-       NlaTrack *new_track = add_nlatrack(adt, track);
+       NlaTrack *new_track = BKE_nlatrack_add(adt, track);
 
        WM_event_add_notifier(C, NC_ANIMATION | ND_NLA | NA_ADDED, NULL);
 
@@ -535,7 +535,7 @@ static void rna_NlaTrack_remove(AnimData *adt, bContext *C, ReportList *reports,
                return;
        }
 
-       free_nlatrack(&adt->nla_tracks, track);
+       BKE_nlatrack_free(&adt->nla_tracks, track);
        RNA_POINTER_INVALIDATE(track_ptr);
 
        WM_event_add_notifier(C, NC_ANIMATION | ND_NLA | NA_REMOVED, NULL);
index 20d5e1e959c89d22bcc6641c8bc2d8c1b84181de..f1c02896447c097eba8c684c702b40f566c317bb 100644 (file)
@@ -371,7 +371,7 @@ static FCurve *rna_NlaStrip_fcurve_find(NlaStrip *strip, ReportList *reports, co
 static NlaStrip *rna_NlaStrip_new(NlaTrack *track, bContext *C, ReportList *reports, const char *UNUSED(name),
                                   int start, bAction *action)
 {
-       NlaStrip *strip = add_nlastrip(action);
+       NlaStrip *strip = BKE_nlastrip_new(action);
        
        if (strip == NULL) {
                BKE_report(reports, RPT_ERROR, "Unable to create new strip");
@@ -384,7 +384,7 @@ static NlaStrip *rna_NlaStrip_new(NlaTrack *track, bContext *C, ReportList *repo
        if (BKE_nlastrips_add_strip(&track->strips, strip) == 0) {
                BKE_report(reports, RPT_ERROR,
                           "Unable to add strip (the track does not have any space to accommodate this new strip)");
-               free_nlastrip(NULL, strip);
+               BKE_nlastrip_free(NULL, strip);
                return NULL;
        }
        
@@ -425,7 +425,7 @@ static void rna_NlaStrip_remove(NlaTrack *track, bContext *C, ReportList *report
                return;
        }
 
-       free_nlastrip(&track->strips, strip);
+       BKE_nlastrip_free(&track->strips, strip);
        RNA_POINTER_INVALIDATE(strip_ptr);
 
        WM_event_add_notifier(C, NC_ANIMATION | ND_NLA | NA_REMOVED, NULL);