diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-10-06 11:49:58 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-10-06 11:49:58 +0300 |
| commit | 359d1bd580c138c2b76b2afaed2a9069d5676707 (patch) | |
| tree | 85d1403f1f4a08862387ff2eee9f9a917981d126 /source/blender/blenkernel/intern/sound.c | |
| parent | 9f15bcb218ef32d5f15e1e13235d2d7fa667e04a (diff) | |
Cleanup: use BLI_path_basename
Diffstat (limited to 'source/blender/blenkernel/intern/sound.c')
| -rw-r--r-- | source/blender/blenkernel/intern/sound.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c index a800d8f3f38..7e7cc8745fd 100644 --- a/source/blender/blenkernel/intern/sound.c +++ b/source/blender/blenkernel/intern/sound.c @@ -74,11 +74,8 @@ static char **audio_device_names = NULL; bSound *BKE_sound_new_file(struct Main *bmain, const char *filepath) { bSound *sound; - - char str[FILE_MAX]; const char *path; - - size_t len; + char str[FILE_MAX]; BLI_strncpy(str, filepath, sizeof(str)); @@ -86,11 +83,7 @@ bSound *BKE_sound_new_file(struct Main *bmain, const char *filepath) BLI_path_abs(str, path); - len = strlen(filepath); - while (len > 0 && filepath[len - 1] != '/' && filepath[len - 1] != '\\') - len--; - - sound = BKE_libblock_alloc(bmain, ID_SO, filepath + len); + sound = BKE_libblock_alloc(bmain, ID_SO, BLI_path_basename(filepath)); BLI_strncpy(sound->name, filepath, FILE_MAX); /* sound->type = SOUND_TYPE_FILE; */ /* XXX unused currently */ |