From 1363ef8d859de3956bcad53a2c9ef6430938fe89 Mon Sep 17 00:00:00 2001 From: Dario Casalinuovo Date: Thu, 2 Apr 2015 00:55:49 +0200 Subject: [PATCH] MediaFilePlayer: use BString for fName attribute --- src/servers/media_addon/MediaFilePlayer.cpp | 4 +--- src/servers/media_addon/MediaFilePlayer.h | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/servers/media_addon/MediaFilePlayer.cpp b/src/servers/media_addon/MediaFilePlayer.cpp index 9ce78188b5..0b997e29a8 100644 --- a/src/servers/media_addon/MediaFilePlayer.cpp +++ b/src/servers/media_addon/MediaFilePlayer.cpp @@ -61,13 +61,12 @@ PlayMediaFile(const char* media_type, const char* media_name) MediaFilePlayer::MediaFilePlayer(const char* media_type, const char* media_name, entry_ref* ref) : + fName(media_name), fInitCheck(B_ERROR), fRef(*ref), fSoundPlayer(NULL), fPlayTrack(NULL) { - fName = strdup(media_name); - fPlayFile = new BMediaFile(&fRef); fInitCheck = fPlayFile->InitCheck(); if (fInitCheck != B_OK) @@ -111,7 +110,6 @@ MediaFilePlayer::~MediaFilePlayer() { delete fSoundPlayer; delete fPlayFile; - free(fName); } diff --git a/src/servers/media_addon/MediaFilePlayer.h b/src/servers/media_addon/MediaFilePlayer.h index 508be95a0c..5ef0bb55e0 100644 --- a/src/servers/media_addon/MediaFilePlayer.h +++ b/src/servers/media_addon/MediaFilePlayer.h @@ -11,6 +11,7 @@ #include #include #include +#include void PlayMediaFile(const char* media_type, const char* media_name); @@ -38,7 +39,7 @@ public: const media_raw_audio_format& format); private: - char* fName; + BString fName; status_t fInitCheck; entry_ref fRef; BSoundPlayer* fSoundPlayer;