eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2026-01-17 12:21:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup Source Fail reporting

Browse Source 
All Stream report failure with logs, read in InfoVisitor for Sources. ImGuiVisitor for Sources also detect failure of source and its stream.
Cleanup of unused includes and functions.
This commit is contained in:
Bruno Herbelin
2023-01-30 00:07:52 +01:00
parent 5ce465cb30
commit 6529b170e6
15 changed files with 347 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/NetworkSource.cpp
View File

@@ -123,8 +123,7 @@ void NetworkStream::connect(const std::string &nameconnection)
// refuse self referencing
if (nameconnection.compare(Connection::manager().info().name) == 0) {
Log::Warning("Cannot create self-referencing Network Source '%s'", nameconnection.c_str());
failed_ = true;
fail("Cannot create self-referencing Network Source " + nameconnection);
return;
}
@@ -133,8 +132,7 @@ void NetworkStream::connect(const std::string &nameconnection)
// Nope, cannot connect to unknown connection
if (streamer_index < 0) {
Log::Warning("Cannot connect to %s: please make sure %s is active on this machine.", nameconnection.c_str(), APP_NAME);
failed_ = true;
fail("Cannot connect to " + nameconnection + ". Please make sure vimix is active on this machine");
return;
}
@@ -159,8 +157,7 @@ void NetworkStream::connect(const std::string &nameconnection)
}
}
if (receiver_ == nullptr) {
Log::Notify("Cannot establish connection with %s. Please check your network.", streamer_.name.c_str());
failed_ = true;
fail("Cannot establish connection with " + streamer_.name + ". Please check your network.");
return;
}
@@ -191,6 +188,7 @@ void NetworkStream::disconnect()
{
// receiver should not be active anyway, make sure it is deleted
if (receiver_) {
receiver_->AsynchronousBreak();
delete receiver_;
receiver_ = nullptr;
}
@@ -297,8 +295,7 @@ void NetworkStream::update()
}
}
else {
Log::Warning("Connection was rejected by %s.\nMake sure Sharing on local network is enabled and try again.", streamer_.name.c_str());
failed_=true;
fail("Connection was rejected by " + streamer_.name + ".\nMake sure Sharing on local network is enabled and try again.");
}
}
}