3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-30 20:21:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

macos better wrapper

Browse source
This commit is contained in:
Slic3rPE 2019-12-11 10:16:32 +01:00 • committed by David Kocik
parent 95ff384e47
commit 9e4f470f98
2 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/slic3r/GUI/RemovableDriveManager.hpp
View file

@ -6,6 +6,10 @@
namespace Slic3r {
namespace GUI {
class RDMMMWrapper;
#if __APPLE__
struct DriveData
{
std::string name;
@ -57,25 +61,24 @@ private:
//INT_PTR WINAPI WinProcCallback(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
#else
#if __APPLE__
RemovableDriveManagerMM * m_rdmmm;
RDMMMWrapper * m_rdmmm;
#endif
void search_path(const std::string &path, const std::string &parent_path);
void inspect_file(const std::string &path, const std::string &parent_path);
bool compare_filesystem_id(const std::string &path_a, const std::string &path_b);
#endif
};
#if __APPLE__
class RemovableDriveManagerMM
{
public:
RemovableDriveManagerMM();
~RemovableDriveManagerMM();
register_window();
list_devices();
private:
RemovableDriveManagerMMImpl *m_imp;
friend void RemovableDriveManager::inspect_file(const std::string &path, const std::string &parent_path);
};
class RDMMMWrapper
{
public:
RDMMMWrapper();
~RDMMMWrapper();
void register_window();
void list_devices();
private:
void *m_imp;
friend void RemovableDriveManager::inspect_file(const std::string &path, const std::string &parent_path);
};
#endif
}}
#endif

21
src/slic3r/GUI/RemovableDriveManagerMM.mm
View file

@ -36,31 +36,28 @@
}
namespace Slic3r {
namespace GUI {
struct RemovableDriveManagerMMImpl{
RemovableDriveManagerMM * wrap;
RDMMMWrapper::RDMMMWrapper():m_imp(nullptr){
m_imp = [[RemovableDriveManagerMM alloc] init];
}
RemovableDriveManagerMM():impl(new RemovableDriveManagerMMImpl){
impl->wrap = [[RemovableDriveManagerMM alloc] init];
}
RemovableDriveManagerMM::~RemovableDriveManagerMM()
RDMMMWrapper::~RDMMMWrapper()
{
if(impl)
if(m_imp)
{
[impl->wrap release];
[m_imp release];
}
}
void RDMMMWrapper::register_window()
{
if(impl->wrap)
if(m_imp)
{
[impl->wrap add_unmount_observer];
[m_imp add_unmount_observer];
}
}
void RDMMMWrapper::list_devices()
{
if(impl->wrap)
if(m_imp)
{
NSArray* devices = [impl->wrap list_dev];
NSArray* devices = [m_imp list_dev];
for (NSString* volumePath in devices)
{
NSLog(@"%@", volumePath);