Anthony/open-story-teller
1
0
Fork 0
mirror of https://github.com/arabine/open-story-teller.git synced 2025-12-06 17:09:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix windows build

Browse source
This commit is contained in:
Anthony Rabine 2023-05-28 15:45:49 +02:00
parent 41255f2cec
commit 0ef87ca325
7 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitignore vendored
View file

@ -22,3 +22,9 @@ hardware/kicad/ost-pico-addon/fp-info-cache
*.png~ *.png~
build-story-editor-Desktop_Qt_6_5_1_GCC_64bit-Debug/ build-story-editor-Desktop_Qt_6_5_1_GCC_64bit-Debug/
build-story-editor-Desktop_Qt_6_5_1_MinGW_64_bit-Debug/
build-story-editor-Desktop_Qt_6_5_1_MinGW_64_bit-Release/
build-story-editor-Desktop_Qt_6_5_1_MSVC2019_64bit-Debug/

2
story-editor/src/main_window.cpp
View file

@ -563,7 +563,7 @@ uint8_t MainWindow::Syscall(uint8_t code)
// sound file name address is in R1 // sound file name address is in R1
QString soundFile = m_model.BuildFullSoundPath(GetFileNameFromMemory(m_chip32_ctx.registers[R1])); QString soundFile = m_model.BuildFullSoundPath(GetFileNameFromMemory(m_chip32_ctx.registers[R1]));
qDebug() << ", Sound: " << soundFile; qDebug() << ", Sound: " << soundFile;
m_model.PlaySound(soundFile); m_model.PlaySoundFile(soundFile);
} }
retCode = SYSCALL_RET_WAIT_EV; // set the VM in pause retCode = SYSCALL_RET_WAIT_EV; // set the VM in pause
} }

2
story-editor/src/media_node_model.cpp
View file

@ -52,7 +52,7 @@ MediaNodeModel::MediaNodeModel(StoryGraphModel &model)
}); });
connect(m_ui.playSoundButton, &QPushButton::clicked, [&](bool enable) { connect(m_ui.playSoundButton, &QPushButton::clicked, [&](bool enable) {
m_model.PlaySound(m_soundFilePath); m_model.PlaySoundFile(m_soundFilePath);
}); });
m_ui.playSoundButton->setEnabled(false); m_ui.playSoundButton->setEnabled(false);

4
story-editor/src/resources_dock.cpp
View file

@ -29,7 +29,7 @@ ResourcesDock::ResourcesDock(StoryProject &project, ResourceModel &model)
Resource res; Resource res;
res.format = "BMP"; res.format = "BMP";
res.type = "image"; res.type = "image";
res.file = p.filename(); res.file = p.filename().generic_string();
m_resourcesModel.Append(res); m_resourcesModel.Append(res);
} }
}); });
@ -49,7 +49,7 @@ ResourcesDock::ResourcesDock(StoryProject &project, ResourceModel &model)
Resource res; Resource res;
res.format = "WAV"; res.format = "WAV";
res.type = "sound"; res.type = "sound";
res.file = p.filename(); res.file = p.filename().generic_string();
m_resourcesModel.Append(res); m_resourcesModel.Append(res);
} }
}); });

2
story-editor/src/story_graph_model.cpp
View file

@ -46,7 +46,7 @@ void StoryGraphModel::AudioThread()
} }
} }
void StoryGraphModel::PlaySound(const QString &fileName) void StoryGraphModel::PlaySoundFile(const QString &fileName)
{ {
m_audioQueue.push({"play", fileName.toStdString()}); m_audioQueue.push({"play", fileName.toStdString()});
} }

2
story-editor/src/story_graph_model.h
View file

@ -180,7 +180,7 @@ public:
std::string GetNodeEntryLabel(NodeId nodeId) const; std::string GetNodeEntryLabel(NodeId nodeId) const;
// Centralized for wide usage // Centralized for wide usage
void PlaySound(const QString &fileName); void PlaySoundFile(const QString &fileName);
NodeId FindFirstNode() const; NodeId FindFirstNode() const;
signals: signals:

4
story-editor/src/story_project.cpp
View file

@ -17,7 +17,7 @@ void StoryProject::Initialize(const std::string &file_path)
{ {
m_project_file_path = file_path; m_project_file_path = file_path;
std::filesystem::path p(file_path); std::filesystem::path p(file_path);
m_working_dir= p.parent_path(); m_working_dir= p.parent_path().generic_string();
// Frist try to create the working directory // Frist try to create the working directory
if (!std::filesystem::is_directory(m_working_dir)) if (!std::filesystem::is_directory(m_working_dir))
@ -40,7 +40,7 @@ bool StoryProject::Load(const std::string &file_path, nlohmann::json &model)
bool success = false; bool success = false;
std::filesystem::path p(file_path); std::filesystem::path p(file_path);
m_working_dir= p.parent_path(); m_working_dir= p.parent_path().generic_string();
std::cout << "Working dir is: " << m_working_dir << std::endl; std::cout << "Working dir is: " << m_working_dir << std::endl;