mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2025-02-03 05:14:44 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added start/stop commands to the rigctl server

Browse Source
This commit is contained in:
AlexandreRouma 2021-11-05 19:42:49 +01:00
parent a938324886
commit 927115b50b
3 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
core/src/gui/main_window.cpp
View File

@ -362,21 +362,14 @@ void MainWindow::draw() {
if (playing) { if (playing) {
ImGui::PushID(ImGui::GetID("sdrpp_stop_btn")); ImGui::PushID(ImGui::GetID("sdrpp_stop_btn"));
if (ImGui::ImageButton(icons::STOP, ImVec2(30, 30), ImVec2(0, 0), ImVec2(1, 1), 5) || ImGui::IsKeyPressed(GLFW_KEY_END, false)) { if (ImGui::ImageButton(icons::STOP, ImVec2(30, 30), ImVec2(0, 0), ImVec2(1, 1), 5) || ImGui::IsKeyPressed(GLFW_KEY_END, false)) {
playing = false; setPlayState(false);
onPlayStateChange.emit(false);
sigpath::sourceManager.stop();
sigpath::signalPath.inputBuffer.flush();
} }
ImGui::PopID(); ImGui::PopID();
} }
else { // TODO: Might need to check if there even is a device else { // TODO: Might need to check if there even is a device
ImGui::PushID(ImGui::GetID("sdrpp_play_btn")); ImGui::PushID(ImGui::GetID("sdrpp_play_btn"));
if (ImGui::ImageButton(icons::PLAY, ImVec2(30, 30), ImVec2(0, 0), ImVec2(1, 1), 5) || ImGui::IsKeyPressed(GLFW_KEY_END, false)) { if (ImGui::ImageButton(icons::PLAY, ImVec2(30, 30), ImVec2(0, 0), ImVec2(1, 1), 5) || ImGui::IsKeyPressed(GLFW_KEY_END, false)) {
sigpath::signalPath.inputBuffer.flush(); setPlayState(true);
sigpath::sourceManager.start();
sigpath::sourceManager.tune(gui::waterfall.getCenterFrequency());
playing = true;
onPlayStateChange.emit(true);
} }
ImGui::PopID(); ImGui::PopID();
} }
@ -659,6 +652,23 @@ void MainWindow::draw() {
} }
} }
void MainWindow::setPlayState(bool _playing) {
if (_playing == playing) { return; }
if (_playing) {
sigpath::signalPath.inputBuffer.flush();
sigpath::sourceManager.start();
sigpath::sourceManager.tune(gui::waterfall.getCenterFrequency());
playing = true;
onPlayStateChange.emit(true);
}
else {
playing = false;
onPlayStateChange.emit(false);
sigpath::sourceManager.stop();
sigpath::signalPath.inputBuffer.flush();
}
}
void MainWindow::setViewBandwidthSlider(float bandwidth) { void MainWindow::setViewBandwidthSlider(float bandwidth) {
bw = bandwidth; bw = bandwidth;
} }

1
core/src/gui/main_window.h
View File

@ -23,6 +23,7 @@ public:
// TODO: Replace with it's own class // TODO: Replace with it's own class
void setVFO(double freq); void setVFO(double freq);
void setPlayState(bool _playing);
bool isPlaying(); bool isPlaying();
bool lockWaterfallControls = false; bool lockWaterfallControls = false;

6
misc_modules/rigctl_server/src/main.cpp
View File

@ -613,6 +613,12 @@ private:
else if (parts[0] == "q" || parts[0] == "\\quit") { else if (parts[0] == "q" || parts[0] == "\\quit") {
// Will close automatically // Will close automatically
} }
else if (parts[0] == "\\start") {
gui::mainWindow.setPlayState(true);
}
else if (parts[0] == "\\stop") {
gui::mainWindow.setPlayState(false);
}
else if (parts[0] == "\\dump_state") { else if (parts[0] == "\\dump_state") {
std::lock_guard lck(vfoMtx); std::lock_guard lck(vfoMtx);
resp = resp =