eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-24 16:49:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

New Playlists and new main panel

Browse Source 
Favorite and custom playlists of Sessions. Main panel separate control of current session (with preview) and selection of session in playlists. Bugfix in history of files.
This commit is contained in:
Bruno Herbelin
2023-09-17 00:51:34 +02:00
parent 00f7e0fe62
commit 33c222555f
15 changed files with 1697 additions and 854 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/Settings.cpp
View File

@@ -41,6 +41,7 @@ XMLElement *save_history(Settings::History &h, const char *nodename, XMLDocument
pElement->SetAttribute("autoload", h.load_at_start);
pElement->SetAttribute("autosave", h.save_on_exit);
pElement->SetAttribute("valid", h.front_is_valid);
pElement->SetAttribute("ordering", h.ordering);
for(auto it = h.filenames.cbegin();
it != h.filenames.cend(); ++it) {
XMLElement *fileNode = xmlDoc.NewElement("path");
@@ -135,6 +136,8 @@ void Settings::Save(uint64_t runtime)
applicationNode->SetAttribute("action_history_follow_view", application.action_history_follow_view);
applicationNode->SetAttribute("show_tooptips", application.show_tooptips);
applicationNode->SetAttribute("accept_connections", application.accept_connections);
applicationNode->SetAttribute("pannel_main_mode", application.pannel_main_mode);
applicationNode->SetAttribute("pannel_playlist_mode", application.pannel_playlist_mode);
applicationNode->SetAttribute("pannel_history_mode", application.pannel_current_session_mode);
applicationNode->SetAttribute("pannel_always_visible", application.pannel_always_visible);
applicationNode->SetAttribute("stream_protocol", application.stream_protocol);
@@ -261,6 +264,9 @@ void Settings::Save(uint64_t runtime)
// recent session filenames
recent->InsertEndChild( save_history(application.recentSessions, "Session", xmlDoc));
// recent session folders
recent->InsertEndChild( save_history(application.recentPlaylists, "Playlist", xmlDoc));
// recent session folders
recent->InsertEndChild( save_history(application.recentFolders, "Folder", xmlDoc));
@@ -353,6 +359,9 @@ void load_history(Settings::History &h, const char *nodename, XMLElement *root)
pElement->QueryBoolAttribute("autoload", &h.load_at_start);
pElement->QueryBoolAttribute("autosave", &h.save_on_exit);
pElement->QueryBoolAttribute("valid", &h.front_is_valid);
pElement->QueryIntAttribute("ordering", &h.ordering);
h.changed = true;
}
}
@@ -403,11 +412,11 @@ void Settings::Load()
else if (XMLResultError(eResult))
return;
// first element should be called by the application name
XMLElement *pRoot = xmlDoc.FirstChildElement(application.name.c_str());
if (pRoot == nullptr)
return;
// runtime
pRoot->QueryUnsigned64Attribute("runtime", &application.total_runtime);
@@ -422,6 +431,8 @@ void Settings::Load()
applicationNode->QueryBoolAttribute("show_tooptips", &application.show_tooptips);
applicationNode->QueryBoolAttribute("accept_connections", &application.accept_connections);
applicationNode->QueryBoolAttribute("pannel_always_visible", &application.pannel_always_visible);
applicationNode->QueryIntAttribute("pannel_main_mode", &application.pannel_main_mode);
applicationNode->QueryIntAttribute("pannel_playlist_mode", &application.pannel_playlist_mode);
applicationNode->QueryIntAttribute("pannel_history_mode", &application.pannel_current_session_mode);
applicationNode->QueryIntAttribute("stream_protocol", &application.stream_protocol);
applicationNode->QueryIntAttribute("broadcast_port", &application.broadcast_port);
@@ -618,6 +629,9 @@ void Settings::Load()
// recent session filenames
load_history(application.recentSessions, "Session", pElement);
// recent session playlist
load_history(application.recentPlaylists, "Playlist", pElement);
// recent session folders
load_history(application.recentFolders, "Folder", pElement);
@@ -686,6 +700,12 @@ void Settings::Load()
}
void Settings::History::assign(const string &filename)
{
path.assign(filename);
changed = true;
}
void Settings::History::push(const string &filename)
{
if (filename.empty()) {
@@ -718,6 +738,9 @@ void Settings::History::validate()
else
fit = filenames.erase(fit);
}
if (!path.empty() && !SystemToolkit::file_exists( path )) {
path = "";
}
}
void Settings::KnownHosts::push(const string &ip, const string &port)