Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-08-16 02:10:53 -04:00
Code Issues Projects Releases Packages Wiki Activity

File: Extract function to convert path to string.

Browse source
This commit is contained in:
Jared Boone 2016-09-07 22:20:51 -07:00
parent df0fc30fda
commit f80706cb34
3 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
firmware/application/file.cpp
View file

@ -22,6 +22,8 @@
#include "file.hpp" #include "file.hpp"
#include <algorithm> #include <algorithm>
#include <locale>
#include <codecvt>
/* Values added to FatFs FRESULT enum, values outside the FRESULT data type */ /* Values added to FatFs FRESULT enum, values outside the FRESULT data type */
static_assert(sizeof(FIL::err) == 1, "FatFs FIL::err size not expected."); static_assert(sizeof(FIL::err) == 1, "FatFs FIL::err size not expected.");
@ -210,6 +212,11 @@ std::string filesystem_error::what() const {
} }
} }
std::string path_to_string(const path& p) {
std::wstring_convert<std::codecvt_utf8_utf16<path::value_type>, path::value_type> conv;
return conv.to_bytes(p);
}
directory_iterator::directory_iterator( directory_iterator::directory_iterator(
std::filesystem::path path, std::filesystem::path path,
std::filesystem::path wild std::filesystem::path wild

2
firmware/application/file.hpp
View file

@ -70,6 +70,8 @@ using file_status = BYTE;
static_assert(sizeof(path::value_type) == 2, "sizeof(std::filesystem::path::value_type) != 2"); static_assert(sizeof(path::value_type) == 2, "sizeof(std::filesystem::path::value_type) != 2");
static_assert(sizeof(path::value_type) == sizeof(TCHAR), "FatFs TCHAR size != std::filesystem::path::value_type"); static_assert(sizeof(path::value_type) == sizeof(TCHAR), "FatFs TCHAR size != std::filesystem::path::value_type");
std::string path_to_string(const path& p);
struct space_info { struct space_info {
static_assert(sizeof(std::uintmax_t) >= 8, "std::uintmax_t too small (<uint64_t)"); static_assert(sizeof(std::uintmax_t) >= 8, "std::uintmax_t too small (<uint64_t)");

8
firmware/application/ui_record_view.cpp
View file

@ -32,9 +32,6 @@ using namespace portapack;
#include <cstdint> #include <cstdint>
#include <locale>
#include <codecvt>
class FileWriter : public Writer { class FileWriter : public Writer {
public: public:
FileWriter() = default; FileWriter() = default;
@ -289,10 +286,7 @@ void RecordView::start() {
}; };
if( writer ) { if( writer ) {
std::wstring_convert<std::codecvt_utf8_utf16<std::filesystem::path::value_type>, std::filesystem::path::value_type> conv; text_record_filename.set(std::filesystem::path_to_string(filename_stem));
const auto filename_stem_s = conv.to_bytes(filename_stem);
text_record_filename.set(filename_stem_s);
button_record.set_bitmap(&bitmap_stop); button_record.set_bitmap(&bitmap_stop);
capture_thread = std::make_unique<CaptureThread>( capture_thread = std::make_unique<CaptureThread>(
std::move(writer), std::move(writer),