From ba54fac9eb74be6f73e20e2de953cf6f355be57f Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Mon, 28 Feb 2011 20:40:15 +0000 Subject: Convert GetUserPath to return a std::string instead of a const char *. This simplifies its usage in most cases. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7265 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Source/Plugins/Plugin_VideoOGL/Src/Render.cpp') diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 0d3c353bb5..ccee1ef777 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -1188,7 +1188,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons { OSD::AddMessage(StringFromFormat( "Dumping Frames to \"%sframedump0.avi\" (%dx%d RGB24)", - File::GetUserPath(D_DUMPFRAMES_IDX), w, h).c_str(), 2000); + File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), w, h).c_str(), 2000); } } if (s_bAVIDumping) @@ -1228,7 +1228,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons if (g_ActiveConfig.bDumpFrames) { s_criticalScreenshot.Enter(); - char movie_file_name[255]; + std::string movie_file_name; w = dst_rect.GetWidth(); h = dst_rect.GetHeight(); data = new u8[3 * w * h]; @@ -1238,14 +1238,14 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons { if (!s_bLastFrameDumped) { - sprintf(movie_file_name, "%sframedump.raw", File::GetUserPath(D_DUMPFRAMES_IDX)); - f_pFrameDump = fopen(movie_file_name, "wb"); + movie_file_name = File::GetUserPath(D_DUMPFRAMES_IDX) + "framedump.raw"; + f_pFrameDump = fopen(movie_file_name.c_str(), "wb"); if (f_pFrameDump == NULL) OSD::AddMessage("Error opening framedump.raw for writing.", 2000); else { char msg [255]; - sprintf(msg, "Dumping Frames to \"%s\" (%dx%d RGB24)", movie_file_name, w, h); + sprintf(msg, "Dumping Frames to \"%s\" (%dx%d RGB24)", movie_file_name.c_str(), w, h); OSD::AddMessage(msg, 2000); } } -- cgit v1.2.3