feat: Rename displaydevice directory to display_device#64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ReenigneArcher merged 1 commit into from
Jul 17, 2024
Merged

feat: Rename displaydevice directory to display_device #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,4 +16,4 @@ endif()
add_subdirectory(platf)

# This is the main library
add_subdirectory(displaydevice)
add_subdirectory(display_device)
4 changes: 2 additions & 2 deletions src/common/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,8 @@
set(MODULE libcommon)

# Globing headers (so that they appear in some IDEs) and sources
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/*.h")
file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/displaydevice/detail/*.h")
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/*.h")
file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/display_device/detail/*.h")
file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp")

# Automatic library - will be static or dynamic based on user setting
Expand Down
4 changes: 2 additions & 2 deletions src/common/file_settings_persistence.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
// class header include
#include "displaydevice/file_settings_persistence.h"
#include "display_device/file_settings_persistence.h"

// system includes
#include <algorithm>
#include <fstream>
#include <iterator>

// local includes
#include "displaydevice/logging.h"
#include "display_device/logging.h"

namespace display_device {
FileSettingsPersistence::FileSettingsPersistence(std::filesystem::path filepath):
Expand Down
0 ...e/displaydevice/audio_context_interface.h → .../display_device/audio_context_interface.h
View file
Open in desktop
File renamed without changes.
0 ...ude/displaydevice/detail/json_converter.h → ...de/display_device/detail/json_converter.h
View file
Open in desktop
File renamed without changes.
0 ...de/displaydevice/detail/json_serializer.h → ...e/display_device/detail/json_serializer.h
View file
Open in desktop
File renamed without changes.
0 ...aydevice/detail/json_serializer_details.h → ...y_device/detail/json_serializer_details.h
View file
Open in desktop
File renamed without changes.
0 ...displaydevice/file_settings_persistence.h → ...isplay_device/file_settings_persistence.h
View file
Open in desktop
File renamed without changes.
0 src/common/include/displaydevice/json.h → src/common/include/display_device/json.h
View file
Open in desktop
File renamed without changes.
0 src/common/include/displaydevice/logging.h → src/common/include/display_device/logging.h
View file
Open in desktop
File renamed without changes.
0 ...nclude/displaydevice/noop_audio_context.h → ...clude/display_device/noop_audio_context.h
View file
Open in desktop
File renamed without changes.
0 ...displaydevice/noop_settings_persistence.h → ...isplay_device/noop_settings_persistence.h
View file
Open in desktop
File renamed without changes.
0 ...n/include/displaydevice/retry_scheduler.h → .../include/display_device/retry_scheduler.h
View file
Open in desktop
File renamed without changes.
0 ...isplaydevice/settings_manager_interface.h → ...splay_device/settings_manager_interface.h
View file
Open in desktop
File renamed without changes.
0 ...aydevice/settings_persistence_interface.h → ...y_device/settings_persistence_interface.h
View file
Open in desktop
File renamed without changes.
0 src/common/include/displaydevice/types.h → src/common/include/display_device/types.h
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions src/common/json.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
// header include
#include "displaydevice/json.h"
#include "display_device/json.h"

// special ordered include of details
#define DD_JSON_DETAIL
// clang-format off
#include "displaydevice/detail/json_serializer.h"
#include "displaydevice/detail/json_converter.h"
#include "display_device/detail/json_serializer.h"
#include "display_device/detail/json_converter.h"
// clang-format on

namespace display_device {
Expand Down
4 changes: 2 additions & 2 deletions src/common/json_serializer.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
// special ordered include of details
#define DD_JSON_DETAIL
// clang-format off
#include "displaydevice/types.h"
#include "displaydevice/detail/json_serializer.h"
#include "display_device/types.h"
#include "display_device/detail/json_serializer.h"
// clang-format on

namespace display_device {
Expand Down
2 changes: 1 addition & 1 deletion src/common/logging.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// class header include
#include "displaydevice/logging.h"
#include "display_device/logging.h"

// system includes
#include <chrono>
Expand Down
2 changes: 1 addition & 1 deletion src/common/noop_audio_context.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// local includes
#include "displaydevice/noop_audio_context.h"
#include "display_device/noop_audio_context.h"

namespace display_device {
bool
Expand Down
2 changes: 1 addition & 1 deletion src/common/noop_settings_persistence.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// local includes
#include "displaydevice/noop_settings_persistence.h"
#include "display_device/noop_settings_persistence.h"

namespace display_device {
bool
Expand Down
2 changes: 1 addition & 1 deletion src/common/retry_scheduler.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// header include
#include "displaydevice/retry_scheduler.h"
#include "display_device/retry_scheduler.h"

namespace display_device {
SchedulerStopToken::SchedulerStopToken(std::function<void()> cleanup):
Expand Down
2 changes: 1 addition & 1 deletion src/common/types.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// header include
#include "displaydevice/types.h"
#include "display_device/types.h"

namespace {
bool
Expand Down
2 changes: 1 addition & 1 deletion src/displaydevice/CMakeLists.txt → src/display_device/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
set(MODULE libdisplaydevice)

# Globing headers (so that they appear in some IDEs) and sources
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/*.h")
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/*.h")
file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp")

# Automatic library - will be static or dynamic based on user setting
Expand Down
0 .../include/displaydevice/libddplaceholder.h → ...include/display_device/libddplaceholder.h
View file
Open in desktop

@ReenigneArcherReenigneArcherJul 17, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename file?

File renamed without changes.
6 changes: 6 additions & 0 deletions src/display_device/libddplaceholder.cpp
View file
Open in desktop

@ReenigneArcherReenigneArcherJul 17, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename file?

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
#include "display_device/libddplaceholder.h"

int
ddplaceholder() {

@ReenigneArcherReenigneArcherJul 17, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
ddplaceholder() {
dd_placeholder() {

Thoughts?

return 0;
}
6 changes: 0 additions & 6 deletions src/displaydevice/libddplaceholder.cpp
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/platf/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
set(MODULE libplatf)

# Globing headers (so that they appear in some IDEs) and sources
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/*.h")
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/*.h")
file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp")

# Automatic library - will be static or dynamic based on user setting
Expand Down
0 ...clude/displaydevice/libplatfplaceholder.h → ...lude/display_device/libplatfplaceholder.h
View file
Open in desktop

@ReenigneArcherReenigneArcherJul 17, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename file?

File renamed without changes.
2 changes: 1 addition & 1 deletion src/platf/libplatfplaceholder.cpp
View file
Open in desktop

@ReenigneArcherReenigneArcherJul 17, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename file?

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#include "displaydevice/libplatfplaceholder.h"
#include "display_device/libplatfplaceholder.h"

int
plaftplaceholder() {
Expand Down
4 changes: 2 additions & 2 deletions src/windows/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,8 @@
set(MODULE libwindows)

# Globing headers (so that they appear in some IDEs) and sources
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/windows/*.h")
file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/displaydevice/windows/detail/*.h")
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/windows/*.h")
file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/display_device/windows/detail/*.h")
file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp")

# Automatic library - will be static or dynamic based on user setting
Expand Down
2 changes: 1 addition & 1 deletion ...aydevice/windows/detail/json_serializer.h → ...y_device/windows/detail/json_serializer.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
#pragma once

// local includes
#include "displaydevice/detail/json_serializer.h"
#include "display_device/detail/json_serializer.h"

#ifdef DD_JSON_DETAIL
namespace display_device {
Expand Down
2 changes: 1 addition & 1 deletion ...dows/include/displaydevice/windows/json.h → ...ows/include/display_device/windows/json.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
#pragma once

// local includes
#include "displaydevice/json.h"
#include "display_device/json.h"
#include "types.h"

// Windows' converters (add as needed)
Expand Down
4 changes: 2 additions & 2 deletions .../displaydevice/windows/persistent_state.h → ...display_device/windows/persistent_state.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,8 @@
#include <memory>

// local includes
#include "displaydevice/settings_persistence_interface.h"
#include "displaydevice/windows/win_display_device_interface.h"
#include "display_device/settings_persistence_interface.h"
#include "display_device/windows/win_display_device_interface.h"

namespace display_device {
/**
Expand Down
6 changes: 3 additions & 3 deletions .../displaydevice/windows/settings_manager.h → ...display_device/windows/settings_manager.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,9 @@
#include <memory>

// local includes
#include "displaydevice/audio_context_interface.h"
#include "displaydevice/settings_manager_interface.h"
#include "displaydevice/windows/win_display_device_interface.h"
#include "display_device/audio_context_interface.h"
#include "display_device/settings_manager_interface.h"
#include "display_device/windows/win_display_device_interface.h"
#include "persistent_state.h"

namespace display_device {
Expand Down
0 ...de/displaydevice/windows/settings_utils.h → ...e/display_device/windows/settings_utils.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ows/include/displaydevice/windows/types.h → ...ws/include/display_device/windows/types.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
#include <set>

// local includes
#include "displaydevice/types.h"
#include "display_device/types.h"

namespace display_device {
/**
Expand Down
0 ...ude/displaydevice/windows/win_api_layer.h → ...de/display_device/windows/win_api_layer.h
View file
Open in desktop
File renamed without changes.
0 ...ydevice/windows/win_api_layer_interface.h → ..._device/windows/win_api_layer_interface.h
View file
Open in desktop
File renamed without changes.
0 ...ude/displaydevice/windows/win_api_utils.h → ...de/display_device/windows/win_api_utils.h
View file
Open in desktop
File renamed without changes.
0 ...isplaydevice/windows/win_display_device.h → ...splay_device/windows/win_display_device.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ce/windows/win_display_device_interface.h → ...ce/windows/win_display_device_interface.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
#include <set>

// local includes
#include "displaydevice/windows/types.h"
#include "display_device/windows/types.h"

namespace display_device {
/**
Expand Down
6 changes: 3 additions & 3 deletions src/windows/json.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
// header include
#include "displaydevice/windows/json.h"
#include "display_device/windows/json.h"

// special ordered include of details
#define DD_JSON_DETAIL
// clang-format off
#include "displaydevice/windows/detail/json_serializer.h"
#include "displaydevice/detail/json_converter.h"
#include "display_device/windows/detail/json_serializer.h"
#include "display_device/detail/json_converter.h"
// clang-format on

namespace display_device {
Expand Down
4 changes: 2 additions & 2 deletions src/windows/json_serializer.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
// special ordered include of details
#define DD_JSON_DETAIL
// clang-format off
#include "displaydevice/windows/types.h"
#include "displaydevice/windows/detail/json_serializer.h"
#include "display_device/windows/types.h"
#include "display_device/windows/detail/json_serializer.h"
// clang-format on

namespace display_device {
Expand Down
8 changes: 4 additions & 4 deletions src/windows/persistent_state.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
// class header include
#include "displaydevice/windows/persistent_state.h"
#include "display_device/windows/persistent_state.h"

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/noop_settings_persistence.h"
#include "displaydevice/windows/json.h"
#include "display_device/logging.h"
#include "display_device/noop_settings_persistence.h"
#include "display_device/windows/json.h"

namespace display_device {
PersistentState::PersistentState(std::shared_ptr<SettingsPersistenceInterface> settings_persistence_api, const std::optional<SingleDisplayConfigState> &fallback_state):
Expand Down
8 changes: 4 additions & 4 deletions src/windows/settings_manager_apply.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
// class header include
#include "displaydevice/windows/settings_manager.h"
#include "display_device/windows/settings_manager.h"

// system includes
#include <algorithm>
#include <boost/scope/scope_exit.hpp>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/json.h"
#include "displaydevice/windows/settings_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/json.h"
#include "display_device/windows/settings_utils.h"

namespace display_device {
namespace {
Expand Down
6 changes: 3 additions & 3 deletions src/windows/settings_manager_general.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
// class header include
#include "displaydevice/windows/settings_manager.h"
#include "display_device/windows/settings_manager.h"

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/noop_audio_context.h"
#include "display_device/logging.h"
#include "display_device/noop_audio_context.h"

namespace display_device {
SettingsManager::SettingsManager(
Expand Down
8 changes: 4 additions & 4 deletions src/windows/settings_manager_revert.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
// class header include
#include "displaydevice/windows/settings_manager.h"
#include "display_device/windows/settings_manager.h"

// system includes
#include <boost/scope/scope_exit.hpp>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/json.h"
#include "displaydevice/windows/settings_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/json.h"
#include "display_device/windows/settings_utils.h"

namespace display_device {
namespace {
Expand Down
6 changes: 3 additions & 3 deletions src/windows/settings_utils.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
// header include
#include "displaydevice/windows/settings_utils.h"
#include "display_device/windows/settings_utils.h"

// system includes
#include <algorithm>
#include <cmath>
#include <thread>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/json.h"
#include "display_device/logging.h"
#include "display_device/windows/json.h"

namespace display_device::win_utils {
namespace {
Expand Down
2 changes: 1 addition & 1 deletion src/windows/types.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// header include
#include "displaydevice/windows/types.h"
#include "display_device/windows/types.h"

namespace display_device {
bool
Expand Down
4 changes: 2 additions & 2 deletions src/windows/win_api_layer.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// class header include
#include "displaydevice/windows/win_api_layer.h"
#include "display_device/windows/win_api_layer.h"

// system includes
#include <boost/algorithm/string.hpp>
Expand All@@ -12,7 +12,7 @@
#include <iomanip>

// local includes
#include "displaydevice/logging.h"
#include "display_device/logging.h"

// Windows includes after "windows.h"
#include <SetupApi.h>
Expand Down
4 changes: 2 additions & 2 deletions src/windows/win_api_utils.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
// header include
#include "displaydevice/windows/win_api_utils.h"
#include "display_device/windows/win_api_utils.h"

// system includes
#include <unordered_set>

// local includes
#include "displaydevice/logging.h"
#include "display_device/logging.h"

namespace {
/**
Expand Down
6 changes: 3 additions & 3 deletions src/windows/win_display_device_general.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
// class header include
#include "displaydevice/windows/win_display_device.h"
#include "display_device/windows/win_display_device.h"

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/win_api_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/win_api_utils.h"

namespace display_device {
WinDisplayDevice::WinDisplayDevice(std::shared_ptr<WinApiLayerInterface> w_api):
Expand Down
6 changes: 3 additions & 3 deletions src/windows/win_display_device_hdr.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
// class header include
#include "displaydevice/windows/win_display_device.h"
#include "display_device/windows/win_display_device.h"

// system includes
#include <ranges>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/win_api_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/win_api_utils.h"

namespace display_device {
namespace {
Expand Down
6 changes: 3 additions & 3 deletions src/windows/win_display_device_modes.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
// class header include
#include "displaydevice/windows/win_display_device.h"
#include "display_device/windows/win_display_device.h"

// system includes
#include <ranges>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/win_api_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/win_api_utils.h"

namespace display_device {
namespace {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
feat: Rename displaydevice directory to display_device#64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ReenigneArcher
merged 1 commit into

from

Jul 17, 2024
 Merged


feat: Rename displaydevice directory to display_device
#64
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,4 +16,4 @@ endif()
add_subdirectory(platf)

# This is the main library
add_subdirectory(displaydevice)
add_subdirectory(display_device)

4 changes: 2 additions & 2 deletions
src/common/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,8 @@
set(MODULE libcommon)

# Globing headers (so that they appear in some IDEs) and sources
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/*.h")
file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/displaydevice/detail/*.h")
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/*.h")
file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/display_device/detail/*.h")
file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp")

# Automatic library - will be static or dynamic based on user setting
Expand Down

4 changes: 2 additions & 2 deletions
src/common/file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
// class header include
#include "displaydevice/file_settings_persistence.h"
#include "display_device/file_settings_persistence.h"

// system includes
#include <algorithm>
#include <fstream>
#include <iterator>

// local includes
#include "displaydevice/logging.h"
#include "display_device/logging.h"

namespace display_device {
 FileSettingsPersistence::FileSettingsPersistence(std::filesystem::path filepath):
Expand Down

0
...e/displaydevice/audio_context_interface.h → .../display_device/audio_context_interface.h

View file


Open in desktop


File renamed without changes.


0
...ude/displaydevice/detail/json_converter.h → ...de/display_device/detail/json_converter.h

View file


Open in desktop


File renamed without changes.


0
...de/displaydevice/detail/json_serializer.h → ...e/display_device/detail/json_serializer.h

View file


Open in desktop


File renamed without changes.


0
...aydevice/detail/json_serializer_details.h → ...y_device/detail/json_serializer_details.h

View file


Open in desktop


File renamed without changes.


0
...displaydevice/file_settings_persistence.h → ...isplay_device/file_settings_persistence.h

View file


Open in desktop


File renamed without changes.


0
src/common/include/displaydevice/json.h → src/common/include/display_device/json.h

View file


Open in desktop


File renamed without changes.


0
src/common/include/displaydevice/logging.h → src/common/include/display_device/logging.h

View file


Open in desktop


File renamed without changes.


0
...nclude/displaydevice/noop_audio_context.h → ...clude/display_device/noop_audio_context.h

View file


Open in desktop


File renamed without changes.


0
...displaydevice/noop_settings_persistence.h → ...isplay_device/noop_settings_persistence.h

View file


Open in desktop


File renamed without changes.


0
...n/include/displaydevice/retry_scheduler.h → .../include/display_device/retry_scheduler.h

View file


Open in desktop


File renamed without changes.


0
...isplaydevice/settings_manager_interface.h → ...splay_device/settings_manager_interface.h

View file


Open in desktop


File renamed without changes.


0
...aydevice/settings_persistence_interface.h → ...y_device/settings_persistence_interface.h

View file


Open in desktop


File renamed without changes.


0
src/common/include/displaydevice/types.h → src/common/include/display_device/types.h

View file


Open in desktop


File renamed without changes.


6 changes: 3 additions & 3 deletions
src/common/json.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
// header include
#include "displaydevice/json.h"
#include "display_device/json.h"

// special ordered include of details
#define DD_JSON_DETAIL
// clang-format off
#include "displaydevice/detail/json_serializer.h"
#include "displaydevice/detail/json_converter.h"
#include "display_device/detail/json_serializer.h"
#include "display_device/detail/json_converter.h"
// clang-format on

namespace display_device {
Expand Down

4 changes: 2 additions & 2 deletions
src/common/json_serializer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
// special ordered include of details
#define DD_JSON_DETAIL
// clang-format off
#include "displaydevice/types.h"
#include "displaydevice/detail/json_serializer.h"
#include "display_device/types.h"
#include "display_device/detail/json_serializer.h"
// clang-format on

namespace display_device {
Expand Down

2 changes: 1 addition & 1 deletion
src/common/logging.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// class header include
#include "displaydevice/logging.h"
#include "display_device/logging.h"

// system includes
#include <chrono>
Expand Down

2 changes: 1 addition & 1 deletion
src/common/noop_audio_context.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// local includes
#include "displaydevice/noop_audio_context.h"
#include "display_device/noop_audio_context.h"

namespace display_device {
 bool
Expand Down

2 changes: 1 addition & 1 deletion
src/common/noop_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// local includes
#include "displaydevice/noop_settings_persistence.h"
#include "display_device/noop_settings_persistence.h"

namespace display_device {
 bool
Expand Down

2 changes: 1 addition & 1 deletion
src/common/retry_scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// header include
#include "displaydevice/retry_scheduler.h"
#include "display_device/retry_scheduler.h"

namespace display_device {
 SchedulerStopToken::SchedulerStopToken(std::function<void()> cleanup):
Expand Down

2 changes: 1 addition & 1 deletion
src/common/types.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// header include
#include "displaydevice/types.h"
#include "display_device/types.h"

namespace {
 bool
Expand Down

2 changes: 1 addition & 1 deletion
src/displaydevice/CMakeLists.txt → src/display_device/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
set(MODULE libdisplaydevice)

# Globing headers (so that they appear in some IDEs) and sources
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/*.h")
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/*.h")
file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp")

# Automatic library - will be static or dynamic based on user setting
Expand Down

0
.../include/displaydevice/libddplaceholder.h → ...include/display_device/libddplaceholder.h

View file


Open in desktop

@ReenigneArcherReenigneArcherJul 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename file?

File renamed without changes.


6 changes: 6 additions & 0 deletions
src/display_device/libddplaceholder.cpp

View file


Open in desktop

@ReenigneArcherReenigneArcherJul 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename file?
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
#include "display_device/libddplaceholder.h"

int
ddplaceholder() {
@ReenigneArcherReenigneArcherJul 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

ddplaceholder() {
dd_placeholder() {
Thoughts?
 return 0;
}

6 changes: 0 additions & 6 deletions
src/displaydevice/libddplaceholder.cpp

View file


Open in desktop


This file was deleted.


2 changes: 1 addition & 1 deletion
src/platf/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
set(MODULE libplatf)

# Globing headers (so that they appear in some IDEs) and sources
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/*.h")
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/*.h")
file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp")

# Automatic library - will be static or dynamic based on user setting
Expand Down

0
...clude/displaydevice/libplatfplaceholder.h → ...lude/display_device/libplatfplaceholder.h

View file


Open in desktop

@ReenigneArcherReenigneArcherJul 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename file?

File renamed without changes.


2 changes: 1 addition & 1 deletion
src/platf/libplatfplaceholder.cpp

View file


Open in desktop

@ReenigneArcherReenigneArcherJul 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename file?
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#include "displaydevice/libplatfplaceholder.h"
#include "display_device/libplatfplaceholder.h"

int
plaftplaceholder() {
Expand Down

4 changes: 2 additions & 2 deletions
src/windows/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,8 @@
set(MODULE libwindows)

# Globing headers (so that they appear in some IDEs) and sources
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/windows/*.h")
file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/displaydevice/windows/detail/*.h")
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/windows/*.h")
file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/display_device/windows/detail/*.h")
file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp")

# Automatic library - will be static or dynamic based on user setting
Expand Down

2 changes: 1 addition & 1 deletion
...aydevice/windows/detail/json_serializer.h → ...y_device/windows/detail/json_serializer.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
#pragma once

// local includes
#include "displaydevice/detail/json_serializer.h"
#include "display_device/detail/json_serializer.h"

#ifdef DD_JSON_DETAIL
namespace display_device {
Expand Down

2 changes: 1 addition & 1 deletion
...dows/include/displaydevice/windows/json.h → ...ows/include/display_device/windows/json.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
#pragma once

// local includes
#include "displaydevice/json.h"
#include "display_device/json.h"
#include "types.h"

// Windows' converters (add as needed)
Expand Down

4 changes: 2 additions & 2 deletions
.../displaydevice/windows/persistent_state.h → ...display_device/windows/persistent_state.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,8 @@
#include <memory>

// local includes
#include "displaydevice/settings_persistence_interface.h"
#include "displaydevice/windows/win_display_device_interface.h"
#include "display_device/settings_persistence_interface.h"
#include "display_device/windows/win_display_device_interface.h"

namespace display_device {
 /**
Expand Down

6 changes: 3 additions & 3 deletions
.../displaydevice/windows/settings_manager.h → ...display_device/windows/settings_manager.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,9 @@
#include <memory>

// local includes
#include "displaydevice/audio_context_interface.h"
#include "displaydevice/settings_manager_interface.h"
#include "displaydevice/windows/win_display_device_interface.h"
#include "display_device/audio_context_interface.h"
#include "display_device/settings_manager_interface.h"
#include "display_device/windows/win_display_device_interface.h"
#include "persistent_state.h"

namespace display_device {
Expand Down

0
...de/displaydevice/windows/settings_utils.h → ...e/display_device/windows/settings_utils.h

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...ows/include/displaydevice/windows/types.h → ...ws/include/display_device/windows/types.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
#include <set>

// local includes
#include "displaydevice/types.h"
#include "display_device/types.h"

namespace display_device {
 /**
Expand Down

0
...ude/displaydevice/windows/win_api_layer.h → ...de/display_device/windows/win_api_layer.h

View file


Open in desktop


File renamed without changes.


0
...ydevice/windows/win_api_layer_interface.h → ..._device/windows/win_api_layer_interface.h

View file


Open in desktop


File renamed without changes.


0
...ude/displaydevice/windows/win_api_utils.h → ...de/display_device/windows/win_api_utils.h

View file


Open in desktop


File renamed without changes.


0
...isplaydevice/windows/win_display_device.h → ...splay_device/windows/win_display_device.h

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...ce/windows/win_display_device_interface.h → ...ce/windows/win_display_device_interface.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
#include <set>

// local includes
#include "displaydevice/windows/types.h"
#include "display_device/windows/types.h"

namespace display_device {
 /**
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/json.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
// header include
#include "displaydevice/windows/json.h"
#include "display_device/windows/json.h"

// special ordered include of details
#define DD_JSON_DETAIL
// clang-format off
#include "displaydevice/windows/detail/json_serializer.h"
#include "displaydevice/detail/json_converter.h"
#include "display_device/windows/detail/json_serializer.h"
#include "display_device/detail/json_converter.h"
// clang-format on

namespace display_device {
Expand Down

4 changes: 2 additions & 2 deletions
src/windows/json_serializer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
// special ordered include of details
#define DD_JSON_DETAIL
// clang-format off
#include "displaydevice/windows/types.h"
#include "displaydevice/windows/detail/json_serializer.h"
#include "display_device/windows/types.h"
#include "display_device/windows/detail/json_serializer.h"
// clang-format on

namespace display_device {
Expand Down

8 changes: 4 additions & 4 deletions
src/windows/persistent_state.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
// class header include
#include "displaydevice/windows/persistent_state.h"
#include "display_device/windows/persistent_state.h"

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/noop_settings_persistence.h"
#include "displaydevice/windows/json.h"
#include "display_device/logging.h"
#include "display_device/noop_settings_persistence.h"
#include "display_device/windows/json.h"

namespace display_device {
 PersistentState::PersistentState(std::shared_ptr<SettingsPersistenceInterface> settings_persistence_api, const std::optional<SingleDisplayConfigState> &fallback_state):
Expand Down

8 changes: 4 additions & 4 deletions
src/windows/settings_manager_apply.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
// class header include
#include "displaydevice/windows/settings_manager.h"
#include "display_device/windows/settings_manager.h"

// system includes
#include <algorithm>
#include <boost/scope/scope_exit.hpp>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/json.h"
#include "displaydevice/windows/settings_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/json.h"
#include "display_device/windows/settings_utils.h"

namespace display_device {
 namespace {
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/settings_manager_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
// class header include
#include "displaydevice/windows/settings_manager.h"
#include "display_device/windows/settings_manager.h"

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/noop_audio_context.h"
#include "display_device/logging.h"
#include "display_device/noop_audio_context.h"

namespace display_device {
 SettingsManager::SettingsManager(
Expand Down

8 changes: 4 additions & 4 deletions
src/windows/settings_manager_revert.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
// class header include
#include "displaydevice/windows/settings_manager.h"
#include "display_device/windows/settings_manager.h"

// system includes
#include <boost/scope/scope_exit.hpp>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/json.h"
#include "displaydevice/windows/settings_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/json.h"
#include "display_device/windows/settings_utils.h"

namespace display_device {
 namespace {
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/settings_utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
// header include
#include "displaydevice/windows/settings_utils.h"
#include "display_device/windows/settings_utils.h"

// system includes
#include <algorithm>
#include <cmath>
#include <thread>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/json.h"
#include "display_device/logging.h"
#include "display_device/windows/json.h"

namespace display_device::win_utils {
 namespace {
Expand Down

2 changes: 1 addition & 1 deletion
src/windows/types.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// header include
#include "displaydevice/windows/types.h"
#include "display_device/windows/types.h"

namespace display_device {
 bool
Expand Down

4 changes: 2 additions & 2 deletions
src/windows/win_api_layer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// class header include
#include "displaydevice/windows/win_api_layer.h"
#include "display_device/windows/win_api_layer.h"

// system includes
#include <boost/algorithm/string.hpp>
Expand All@@ -12,7 +12,7 @@
#include <iomanip>

// local includes
#include "displaydevice/logging.h"
#include "display_device/logging.h"

// Windows includes after "windows.h"
#include <SetupApi.h>
Expand Down

4 changes: 2 additions & 2 deletions
src/windows/win_api_utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
// header include
#include "displaydevice/windows/win_api_utils.h"
#include "display_device/windows/win_api_utils.h"

// system includes
#include <unordered_set>

// local includes
#include "displaydevice/logging.h"
#include "display_device/logging.h"

namespace {
 /**
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/win_display_device_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
// class header include
#include "displaydevice/windows/win_display_device.h"
#include "display_device/windows/win_display_device.h"

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/win_api_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/win_api_utils.h"

namespace display_device {
 WinDisplayDevice::WinDisplayDevice(std::shared_ptr<WinApiLayerInterface> w_api):
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/win_display_device_hdr.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
// class header include
#include "displaydevice/windows/win_display_device.h"
#include "display_device/windows/win_display_device.h"

// system includes
#include <ranges>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/win_api_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/win_api_utils.h"

namespace display_device {
 namespace {
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/win_display_device_modes.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
// class header include
#include "displaydevice/windows/win_display_device.h"
#include "display_device/windows/win_display_device.h"

// system includes
#include <ranges>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/win_api_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/win_api_utils.h"

namespace display_device {
 namespace {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: Rename displaydevice directory to display_device#64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ReenigneArcher
merged 1 commit into

from

Jul 17, 2024
 Merged


feat: Rename displaydevice directory to display_device
#64
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,4 +16,4 @@ endif()
add_subdirectory(platf)

# This is the main library
add_subdirectory(displaydevice)
add_subdirectory(display_device)

4 changes: 2 additions & 2 deletions
src/common/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,8 @@
set(MODULE libcommon)

# Globing headers (so that they appear in some IDEs) and sources
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/*.h")
file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/displaydevice/detail/*.h")
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/*.h")
file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/display_device/detail/*.h")
file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp")

# Automatic library - will be static or dynamic based on user setting
Expand Down

4 changes: 2 additions & 2 deletions
src/common/file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
// class header include
#include "displaydevice/file_settings_persistence.h"
#include "display_device/file_settings_persistence.h"

// system includes
#include <algorithm>
#include <fstream>
#include <iterator>

// local includes
#include "displaydevice/logging.h"
#include "display_device/logging.h"

namespace display_device {
 FileSettingsPersistence::FileSettingsPersistence(std::filesystem::path filepath):
Expand Down

0
...e/displaydevice/audio_context_interface.h → .../display_device/audio_context_interface.h

View file


Open in desktop


File renamed without changes.


0
...ude/displaydevice/detail/json_converter.h → ...de/display_device/detail/json_converter.h

View file


Open in desktop


File renamed without changes.


0
...de/displaydevice/detail/json_serializer.h → ...e/display_device/detail/json_serializer.h

View file


Open in desktop


File renamed without changes.


0
...aydevice/detail/json_serializer_details.h → ...y_device/detail/json_serializer_details.h

View file


Open in desktop


File renamed without changes.


0
...displaydevice/file_settings_persistence.h → ...isplay_device/file_settings_persistence.h

View file


Open in desktop


File renamed without changes.


0
src/common/include/displaydevice/json.h → src/common/include/display_device/json.h

View file


Open in desktop


File renamed without changes.


0
src/common/include/displaydevice/logging.h → src/common/include/display_device/logging.h

View file


Open in desktop


File renamed without changes.


0
...nclude/displaydevice/noop_audio_context.h → ...clude/display_device/noop_audio_context.h

View file


Open in desktop


File renamed without changes.


0
...displaydevice/noop_settings_persistence.h → ...isplay_device/noop_settings_persistence.h

View file


Open in desktop


File renamed without changes.


0
...n/include/displaydevice/retry_scheduler.h → .../include/display_device/retry_scheduler.h

View file


Open in desktop


File renamed without changes.


0
...isplaydevice/settings_manager_interface.h → ...splay_device/settings_manager_interface.h

View file


Open in desktop


File renamed without changes.


0
...aydevice/settings_persistence_interface.h → ...y_device/settings_persistence_interface.h

View file


Open in desktop


File renamed without changes.


0
src/common/include/displaydevice/types.h → src/common/include/display_device/types.h

View file


Open in desktop


File renamed without changes.


6 changes: 3 additions & 3 deletions
src/common/json.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
// header include
#include "displaydevice/json.h"
#include "display_device/json.h"

// special ordered include of details
#define DD_JSON_DETAIL
// clang-format off
#include "displaydevice/detail/json_serializer.h"
#include "displaydevice/detail/json_converter.h"
#include "display_device/detail/json_serializer.h"
#include "display_device/detail/json_converter.h"
// clang-format on

namespace display_device {
Expand Down

4 changes: 2 additions & 2 deletions
src/common/json_serializer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
// special ordered include of details
#define DD_JSON_DETAIL
// clang-format off
#include "displaydevice/types.h"
#include "displaydevice/detail/json_serializer.h"
#include "display_device/types.h"
#include "display_device/detail/json_serializer.h"
// clang-format on

namespace display_device {
Expand Down

2 changes: 1 addition & 1 deletion
src/common/logging.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// class header include
#include "displaydevice/logging.h"
#include "display_device/logging.h"

// system includes
#include <chrono>
Expand Down

2 changes: 1 addition & 1 deletion
src/common/noop_audio_context.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// local includes
#include "displaydevice/noop_audio_context.h"
#include "display_device/noop_audio_context.h"

namespace display_device {
 bool
Expand Down

2 changes: 1 addition & 1 deletion
src/common/noop_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// local includes
#include "displaydevice/noop_settings_persistence.h"
#include "display_device/noop_settings_persistence.h"

namespace display_device {
 bool
Expand Down

2 changes: 1 addition & 1 deletion
src/common/retry_scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// header include
#include "displaydevice/retry_scheduler.h"
#include "display_device/retry_scheduler.h"

namespace display_device {
 SchedulerStopToken::SchedulerStopToken(std::function<void()> cleanup):
Expand Down

2 changes: 1 addition & 1 deletion
src/common/types.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// header include
#include "displaydevice/types.h"
#include "display_device/types.h"

namespace {
 bool
Expand Down

2 changes: 1 addition & 1 deletion
src/displaydevice/CMakeLists.txt → src/display_device/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
set(MODULE libdisplaydevice)

# Globing headers (so that they appear in some IDEs) and sources
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/*.h")
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/*.h")
file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp")

# Automatic library - will be static or dynamic based on user setting
Expand Down

0
.../include/displaydevice/libddplaceholder.h → ...include/display_device/libddplaceholder.h

View file


Open in desktop

@ReenigneArcherReenigneArcherJul 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename file?

File renamed without changes.


6 changes: 6 additions & 0 deletions
src/display_device/libddplaceholder.cpp

View file


Open in desktop

@ReenigneArcherReenigneArcherJul 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename file?
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
#include "display_device/libddplaceholder.h"

int
ddplaceholder() {
@ReenigneArcherReenigneArcherJul 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

ddplaceholder() {
dd_placeholder() {
Thoughts?
 return 0;
}

6 changes: 0 additions & 6 deletions
src/displaydevice/libddplaceholder.cpp

View file


Open in desktop


This file was deleted.


2 changes: 1 addition & 1 deletion
src/platf/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
set(MODULE libplatf)

# Globing headers (so that they appear in some IDEs) and sources
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/*.h")
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/*.h")
file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp")

# Automatic library - will be static or dynamic based on user setting
Expand Down

0
...clude/displaydevice/libplatfplaceholder.h → ...lude/display_device/libplatfplaceholder.h

View file


Open in desktop

@ReenigneArcherReenigneArcherJul 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename file?

File renamed without changes.


2 changes: 1 addition & 1 deletion
src/platf/libplatfplaceholder.cpp

View file


Open in desktop

@ReenigneArcherReenigneArcherJul 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename file?
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#include "displaydevice/libplatfplaceholder.h"
#include "display_device/libplatfplaceholder.h"

int
plaftplaceholder() {
Expand Down

4 changes: 2 additions & 2 deletions
src/windows/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,8 @@
set(MODULE libwindows)

# Globing headers (so that they appear in some IDEs) and sources
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/windows/*.h")
file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/displaydevice/windows/detail/*.h")
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/windows/*.h")
file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/display_device/windows/detail/*.h")
file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp")

# Automatic library - will be static or dynamic based on user setting
Expand Down

2 changes: 1 addition & 1 deletion
...aydevice/windows/detail/json_serializer.h → ...y_device/windows/detail/json_serializer.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
#pragma once

// local includes
#include "displaydevice/detail/json_serializer.h"
#include "display_device/detail/json_serializer.h"

#ifdef DD_JSON_DETAIL
namespace display_device {
Expand Down

2 changes: 1 addition & 1 deletion
...dows/include/displaydevice/windows/json.h → ...ows/include/display_device/windows/json.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
#pragma once

// local includes
#include "displaydevice/json.h"
#include "display_device/json.h"
#include "types.h"

// Windows' converters (add as needed)
Expand Down

4 changes: 2 additions & 2 deletions
.../displaydevice/windows/persistent_state.h → ...display_device/windows/persistent_state.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,8 @@
#include <memory>

// local includes
#include "displaydevice/settings_persistence_interface.h"
#include "displaydevice/windows/win_display_device_interface.h"
#include "display_device/settings_persistence_interface.h"
#include "display_device/windows/win_display_device_interface.h"

namespace display_device {
 /**
Expand Down

6 changes: 3 additions & 3 deletions
.../displaydevice/windows/settings_manager.h → ...display_device/windows/settings_manager.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,9 @@
#include <memory>

// local includes
#include "displaydevice/audio_context_interface.h"
#include "displaydevice/settings_manager_interface.h"
#include "displaydevice/windows/win_display_device_interface.h"
#include "display_device/audio_context_interface.h"
#include "display_device/settings_manager_interface.h"
#include "display_device/windows/win_display_device_interface.h"
#include "persistent_state.h"

namespace display_device {
Expand Down

0
...de/displaydevice/windows/settings_utils.h → ...e/display_device/windows/settings_utils.h

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...ows/include/displaydevice/windows/types.h → ...ws/include/display_device/windows/types.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
#include <set>

// local includes
#include "displaydevice/types.h"
#include "display_device/types.h"

namespace display_device {
 /**
Expand Down

0
...ude/displaydevice/windows/win_api_layer.h → ...de/display_device/windows/win_api_layer.h

View file


Open in desktop


File renamed without changes.


0
...ydevice/windows/win_api_layer_interface.h → ..._device/windows/win_api_layer_interface.h

View file


Open in desktop


File renamed without changes.


0
...ude/displaydevice/windows/win_api_utils.h → ...de/display_device/windows/win_api_utils.h

View file


Open in desktop


File renamed without changes.


0
...isplaydevice/windows/win_display_device.h → ...splay_device/windows/win_display_device.h

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...ce/windows/win_display_device_interface.h → ...ce/windows/win_display_device_interface.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
#include <set>

// local includes
#include "displaydevice/windows/types.h"
#include "display_device/windows/types.h"

namespace display_device {
 /**
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/json.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
// header include
#include "displaydevice/windows/json.h"
#include "display_device/windows/json.h"

// special ordered include of details
#define DD_JSON_DETAIL
// clang-format off
#include "displaydevice/windows/detail/json_serializer.h"
#include "displaydevice/detail/json_converter.h"
#include "display_device/windows/detail/json_serializer.h"
#include "display_device/detail/json_converter.h"
// clang-format on

namespace display_device {
Expand Down

4 changes: 2 additions & 2 deletions
src/windows/json_serializer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
// special ordered include of details
#define DD_JSON_DETAIL
// clang-format off
#include "displaydevice/windows/types.h"
#include "displaydevice/windows/detail/json_serializer.h"
#include "display_device/windows/types.h"
#include "display_device/windows/detail/json_serializer.h"
// clang-format on

namespace display_device {
Expand Down

8 changes: 4 additions & 4 deletions
src/windows/persistent_state.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
// class header include
#include "displaydevice/windows/persistent_state.h"
#include "display_device/windows/persistent_state.h"

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/noop_settings_persistence.h"
#include "displaydevice/windows/json.h"
#include "display_device/logging.h"
#include "display_device/noop_settings_persistence.h"
#include "display_device/windows/json.h"

namespace display_device {
 PersistentState::PersistentState(std::shared_ptr<SettingsPersistenceInterface> settings_persistence_api, const std::optional<SingleDisplayConfigState> &fallback_state):
Expand Down

8 changes: 4 additions & 4 deletions
src/windows/settings_manager_apply.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
// class header include
#include "displaydevice/windows/settings_manager.h"
#include "display_device/windows/settings_manager.h"

// system includes
#include <algorithm>
#include <boost/scope/scope_exit.hpp>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/json.h"
#include "displaydevice/windows/settings_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/json.h"
#include "display_device/windows/settings_utils.h"

namespace display_device {
 namespace {
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/settings_manager_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
// class header include
#include "displaydevice/windows/settings_manager.h"
#include "display_device/windows/settings_manager.h"

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/noop_audio_context.h"
#include "display_device/logging.h"
#include "display_device/noop_audio_context.h"

namespace display_device {
 SettingsManager::SettingsManager(
Expand Down

8 changes: 4 additions & 4 deletions
src/windows/settings_manager_revert.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
// class header include
#include "displaydevice/windows/settings_manager.h"
#include "display_device/windows/settings_manager.h"

// system includes
#include <boost/scope/scope_exit.hpp>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/json.h"
#include "displaydevice/windows/settings_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/json.h"
#include "display_device/windows/settings_utils.h"

namespace display_device {
 namespace {
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/settings_utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
// header include
#include "displaydevice/windows/settings_utils.h"
#include "display_device/windows/settings_utils.h"

// system includes
#include <algorithm>
#include <cmath>
#include <thread>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/json.h"
#include "display_device/logging.h"
#include "display_device/windows/json.h"

namespace display_device::win_utils {
 namespace {
Expand Down

2 changes: 1 addition & 1 deletion
src/windows/types.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// header include
#include "displaydevice/windows/types.h"
#include "display_device/windows/types.h"

namespace display_device {
 bool
Expand Down

4 changes: 2 additions & 2 deletions
src/windows/win_api_layer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// class header include
#include "displaydevice/windows/win_api_layer.h"
#include "display_device/windows/win_api_layer.h"

// system includes
#include <boost/algorithm/string.hpp>
Expand All@@ -12,7 +12,7 @@
#include <iomanip>

// local includes
#include "displaydevice/logging.h"
#include "display_device/logging.h"

// Windows includes after "windows.h"
#include <SetupApi.h>
Expand Down

4 changes: 2 additions & 2 deletions
src/windows/win_api_utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
// header include
#include "displaydevice/windows/win_api_utils.h"
#include "display_device/windows/win_api_utils.h"

// system includes
#include <unordered_set>

// local includes
#include "displaydevice/logging.h"
#include "display_device/logging.h"

namespace {
 /**
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/win_display_device_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
// class header include
#include "displaydevice/windows/win_display_device.h"
#include "display_device/windows/win_display_device.h"

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/win_api_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/win_api_utils.h"

namespace display_device {
 WinDisplayDevice::WinDisplayDevice(std::shared_ptr<WinApiLayerInterface> w_api):
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/win_display_device_hdr.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
// class header include
#include "displaydevice/windows/win_display_device.h"
#include "display_device/windows/win_display_device.h"

// system includes
#include <ranges>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/win_api_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/win_api_utils.h"

namespace display_device {
 namespace {
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/win_display_device_modes.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
// class header include
#include "displaydevice/windows/win_display_device.h"
#include "display_device/windows/win_display_device.h"

// system includes
#include <ranges>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/win_api_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/win_api_utils.h"

namespace display_device {
 namespace {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: Rename displaydevice directory to display_device#64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ReenigneArcher
merged 1 commit into

from

Jul 17, 2024
 Merged


feat: Rename displaydevice directory to display_device
#64
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,4 +16,4 @@ endif()
add_subdirectory(platf)

# This is the main library
add_subdirectory(displaydevice)
add_subdirectory(display_device)

4 changes: 2 additions & 2 deletions
src/common/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,8 @@
set(MODULE libcommon)

# Globing headers (so that they appear in some IDEs) and sources
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/*.h")
file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/displaydevice/detail/*.h")
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/*.h")
file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/display_device/detail/*.h")
file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp")

# Automatic library - will be static or dynamic based on user setting
Expand Down

4 changes: 2 additions & 2 deletions
src/common/file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
// class header include
#include "displaydevice/file_settings_persistence.h"
#include "display_device/file_settings_persistence.h"

// system includes
#include <algorithm>
#include <fstream>
#include <iterator>

// local includes
#include "displaydevice/logging.h"
#include "display_device/logging.h"

namespace display_device {
 FileSettingsPersistence::FileSettingsPersistence(std::filesystem::path filepath):
Expand Down

0
...e/displaydevice/audio_context_interface.h → .../display_device/audio_context_interface.h

View file


Open in desktop


File renamed without changes.


0
...ude/displaydevice/detail/json_converter.h → ...de/display_device/detail/json_converter.h

View file


Open in desktop


File renamed without changes.


0
...de/displaydevice/detail/json_serializer.h → ...e/display_device/detail/json_serializer.h

View file


Open in desktop


File renamed without changes.


0
...aydevice/detail/json_serializer_details.h → ...y_device/detail/json_serializer_details.h

View file


Open in desktop


File renamed without changes.


0
...displaydevice/file_settings_persistence.h → ...isplay_device/file_settings_persistence.h

View file


Open in desktop


File renamed without changes.


0
src/common/include/displaydevice/json.h → src/common/include/display_device/json.h

View file


Open in desktop


File renamed without changes.


0
src/common/include/displaydevice/logging.h → src/common/include/display_device/logging.h

View file


Open in desktop


File renamed without changes.


0
...nclude/displaydevice/noop_audio_context.h → ...clude/display_device/noop_audio_context.h

View file


Open in desktop


File renamed without changes.


0
...displaydevice/noop_settings_persistence.h → ...isplay_device/noop_settings_persistence.h

View file


Open in desktop


File renamed without changes.


0
...n/include/displaydevice/retry_scheduler.h → .../include/display_device/retry_scheduler.h

View file


Open in desktop


File renamed without changes.


0
...isplaydevice/settings_manager_interface.h → ...splay_device/settings_manager_interface.h

View file


Open in desktop


File renamed without changes.


0
...aydevice/settings_persistence_interface.h → ...y_device/settings_persistence_interface.h

View file


Open in desktop


File renamed without changes.


0
src/common/include/displaydevice/types.h → src/common/include/display_device/types.h

View file


Open in desktop


File renamed without changes.


6 changes: 3 additions & 3 deletions
src/common/json.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
// header include
#include "displaydevice/json.h"
#include "display_device/json.h"

// special ordered include of details
#define DD_JSON_DETAIL
// clang-format off
#include "displaydevice/detail/json_serializer.h"
#include "displaydevice/detail/json_converter.h"
#include "display_device/detail/json_serializer.h"
#include "display_device/detail/json_converter.h"
// clang-format on

namespace display_device {
Expand Down

4 changes: 2 additions & 2 deletions
src/common/json_serializer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
// special ordered include of details
#define DD_JSON_DETAIL
// clang-format off
#include "displaydevice/types.h"
#include "displaydevice/detail/json_serializer.h"
#include "display_device/types.h"
#include "display_device/detail/json_serializer.h"
// clang-format on

namespace display_device {
Expand Down

2 changes: 1 addition & 1 deletion
src/common/logging.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// class header include
#include "displaydevice/logging.h"
#include "display_device/logging.h"

// system includes
#include <chrono>
Expand Down

2 changes: 1 addition & 1 deletion
src/common/noop_audio_context.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// local includes
#include "displaydevice/noop_audio_context.h"
#include "display_device/noop_audio_context.h"

namespace display_device {
 bool
Expand Down

2 changes: 1 addition & 1 deletion
src/common/noop_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// local includes
#include "displaydevice/noop_settings_persistence.h"
#include "display_device/noop_settings_persistence.h"

namespace display_device {
 bool
Expand Down

2 changes: 1 addition & 1 deletion
src/common/retry_scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// header include
#include "displaydevice/retry_scheduler.h"
#include "display_device/retry_scheduler.h"

namespace display_device {
 SchedulerStopToken::SchedulerStopToken(std::function<void()> cleanup):
Expand Down

2 changes: 1 addition & 1 deletion
src/common/types.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// header include
#include "displaydevice/types.h"
#include "display_device/types.h"

namespace {
 bool
Expand Down

2 changes: 1 addition & 1 deletion
src/displaydevice/CMakeLists.txt → src/display_device/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
set(MODULE libdisplaydevice)

# Globing headers (so that they appear in some IDEs) and sources
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/*.h")
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/*.h")
file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp")

# Automatic library - will be static or dynamic based on user setting
Expand Down

0
.../include/displaydevice/libddplaceholder.h → ...include/display_device/libddplaceholder.h

View file


Open in desktop

@ReenigneArcherReenigneArcherJul 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename file?

File renamed without changes.


6 changes: 6 additions & 0 deletions
src/display_device/libddplaceholder.cpp

View file


Open in desktop

@ReenigneArcherReenigneArcherJul 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename file?
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
#include "display_device/libddplaceholder.h"

int
ddplaceholder() {
@ReenigneArcherReenigneArcherJul 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

ddplaceholder() {
dd_placeholder() {
Thoughts?
 return 0;
}

6 changes: 0 additions & 6 deletions
src/displaydevice/libddplaceholder.cpp

View file


Open in desktop


This file was deleted.


2 changes: 1 addition & 1 deletion
src/platf/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
set(MODULE libplatf)

# Globing headers (so that they appear in some IDEs) and sources
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/*.h")
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/*.h")
file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp")

# Automatic library - will be static or dynamic based on user setting
Expand Down

0
...clude/displaydevice/libplatfplaceholder.h → ...lude/display_device/libplatfplaceholder.h

View file


Open in desktop

@ReenigneArcherReenigneArcherJul 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename file?

File renamed without changes.


2 changes: 1 addition & 1 deletion
src/platf/libplatfplaceholder.cpp

View file


Open in desktop

@ReenigneArcherReenigneArcherJul 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename file?
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#include "displaydevice/libplatfplaceholder.h"
#include "display_device/libplatfplaceholder.h"

int
plaftplaceholder() {
Expand Down

4 changes: 2 additions & 2 deletions
src/windows/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,8 @@
set(MODULE libwindows)

# Globing headers (so that they appear in some IDEs) and sources
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/windows/*.h")
file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/displaydevice/windows/detail/*.h")
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/windows/*.h")
file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/display_device/windows/detail/*.h")
file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp")

# Automatic library - will be static or dynamic based on user setting
Expand Down

2 changes: 1 addition & 1 deletion
...aydevice/windows/detail/json_serializer.h → ...y_device/windows/detail/json_serializer.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
#pragma once

// local includes
#include "displaydevice/detail/json_serializer.h"
#include "display_device/detail/json_serializer.h"

#ifdef DD_JSON_DETAIL
namespace display_device {
Expand Down

2 changes: 1 addition & 1 deletion
...dows/include/displaydevice/windows/json.h → ...ows/include/display_device/windows/json.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
#pragma once

// local includes
#include "displaydevice/json.h"
#include "display_device/json.h"
#include "types.h"

// Windows' converters (add as needed)
Expand Down

4 changes: 2 additions & 2 deletions
.../displaydevice/windows/persistent_state.h → ...display_device/windows/persistent_state.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,8 @@
#include <memory>

// local includes
#include "displaydevice/settings_persistence_interface.h"
#include "displaydevice/windows/win_display_device_interface.h"
#include "display_device/settings_persistence_interface.h"
#include "display_device/windows/win_display_device_interface.h"

namespace display_device {
 /**
Expand Down

6 changes: 3 additions & 3 deletions
.../displaydevice/windows/settings_manager.h → ...display_device/windows/settings_manager.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,9 @@
#include <memory>

// local includes
#include "displaydevice/audio_context_interface.h"
#include "displaydevice/settings_manager_interface.h"
#include "displaydevice/windows/win_display_device_interface.h"
#include "display_device/audio_context_interface.h"
#include "display_device/settings_manager_interface.h"
#include "display_device/windows/win_display_device_interface.h"
#include "persistent_state.h"

namespace display_device {
Expand Down

0
...de/displaydevice/windows/settings_utils.h → ...e/display_device/windows/settings_utils.h

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...ows/include/displaydevice/windows/types.h → ...ws/include/display_device/windows/types.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
#include <set>

// local includes
#include "displaydevice/types.h"
#include "display_device/types.h"

namespace display_device {
 /**
Expand Down

0
...ude/displaydevice/windows/win_api_layer.h → ...de/display_device/windows/win_api_layer.h

View file


Open in desktop


File renamed without changes.


0
...ydevice/windows/win_api_layer_interface.h → ..._device/windows/win_api_layer_interface.h

View file


Open in desktop


File renamed without changes.


0
...ude/displaydevice/windows/win_api_utils.h → ...de/display_device/windows/win_api_utils.h

View file


Open in desktop


File renamed without changes.


0
...isplaydevice/windows/win_display_device.h → ...splay_device/windows/win_display_device.h

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...ce/windows/win_display_device_interface.h → ...ce/windows/win_display_device_interface.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
#include <set>

// local includes
#include "displaydevice/windows/types.h"
#include "display_device/windows/types.h"

namespace display_device {
 /**
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/json.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
// header include
#include "displaydevice/windows/json.h"
#include "display_device/windows/json.h"

// special ordered include of details
#define DD_JSON_DETAIL
// clang-format off
#include "displaydevice/windows/detail/json_serializer.h"
#include "displaydevice/detail/json_converter.h"
#include "display_device/windows/detail/json_serializer.h"
#include "display_device/detail/json_converter.h"
// clang-format on

namespace display_device {
Expand Down

4 changes: 2 additions & 2 deletions
src/windows/json_serializer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
// special ordered include of details
#define DD_JSON_DETAIL
// clang-format off
#include "displaydevice/windows/types.h"
#include "displaydevice/windows/detail/json_serializer.h"
#include "display_device/windows/types.h"
#include "display_device/windows/detail/json_serializer.h"
// clang-format on

namespace display_device {
Expand Down

8 changes: 4 additions & 4 deletions
src/windows/persistent_state.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
// class header include
#include "displaydevice/windows/persistent_state.h"
#include "display_device/windows/persistent_state.h"

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/noop_settings_persistence.h"
#include "displaydevice/windows/json.h"
#include "display_device/logging.h"
#include "display_device/noop_settings_persistence.h"
#include "display_device/windows/json.h"

namespace display_device {
 PersistentState::PersistentState(std::shared_ptr<SettingsPersistenceInterface> settings_persistence_api, const std::optional<SingleDisplayConfigState> &fallback_state):
Expand Down

8 changes: 4 additions & 4 deletions
src/windows/settings_manager_apply.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
// class header include
#include "displaydevice/windows/settings_manager.h"
#include "display_device/windows/settings_manager.h"

// system includes
#include <algorithm>
#include <boost/scope/scope_exit.hpp>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/json.h"
#include "displaydevice/windows/settings_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/json.h"
#include "display_device/windows/settings_utils.h"

namespace display_device {
 namespace {
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/settings_manager_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
// class header include
#include "displaydevice/windows/settings_manager.h"
#include "display_device/windows/settings_manager.h"

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/noop_audio_context.h"
#include "display_device/logging.h"
#include "display_device/noop_audio_context.h"

namespace display_device {
 SettingsManager::SettingsManager(
Expand Down

8 changes: 4 additions & 4 deletions
src/windows/settings_manager_revert.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
// class header include
#include "displaydevice/windows/settings_manager.h"
#include "display_device/windows/settings_manager.h"

// system includes
#include <boost/scope/scope_exit.hpp>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/json.h"
#include "displaydevice/windows/settings_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/json.h"
#include "display_device/windows/settings_utils.h"

namespace display_device {
 namespace {
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/settings_utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
// header include
#include "displaydevice/windows/settings_utils.h"
#include "display_device/windows/settings_utils.h"

// system includes
#include <algorithm>
#include <cmath>
#include <thread>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/json.h"
#include "display_device/logging.h"
#include "display_device/windows/json.h"

namespace display_device::win_utils {
 namespace {
Expand Down

2 changes: 1 addition & 1 deletion
src/windows/types.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// header include
#include "displaydevice/windows/types.h"
#include "display_device/windows/types.h"

namespace display_device {
 bool
Expand Down

4 changes: 2 additions & 2 deletions
src/windows/win_api_layer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// class header include
#include "displaydevice/windows/win_api_layer.h"
#include "display_device/windows/win_api_layer.h"

// system includes
#include <boost/algorithm/string.hpp>
Expand All@@ -12,7 +12,7 @@
#include <iomanip>

// local includes
#include "displaydevice/logging.h"
#include "display_device/logging.h"

// Windows includes after "windows.h"
#include <SetupApi.h>
Expand Down

4 changes: 2 additions & 2 deletions
src/windows/win_api_utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
// header include
#include "displaydevice/windows/win_api_utils.h"
#include "display_device/windows/win_api_utils.h"

// system includes
#include <unordered_set>

// local includes
#include "displaydevice/logging.h"
#include "display_device/logging.h"

namespace {
 /**
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/win_display_device_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
// class header include
#include "displaydevice/windows/win_display_device.h"
#include "display_device/windows/win_display_device.h"

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/win_api_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/win_api_utils.h"

namespace display_device {
 WinDisplayDevice::WinDisplayDevice(std::shared_ptr<WinApiLayerInterface> w_api):
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/win_display_device_hdr.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
// class header include
#include "displaydevice/windows/win_display_device.h"
#include "display_device/windows/win_display_device.h"

// system includes
#include <ranges>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/win_api_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/win_api_utils.h"

namespace display_device {
 namespace {
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/win_display_device_modes.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
// class header include
#include "displaydevice/windows/win_display_device.h"
#include "display_device/windows/win_display_device.h"

// system includes
#include <ranges>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/win_api_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/win_api_utils.h"

namespace display_device {
 namespace {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
feat: Rename displaydevice directory to display_device#64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ReenigneArcher
merged 1 commit into

from

Jul 17, 2024
 Merged


feat: Rename displaydevice directory to display_device
#64
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,4 +16,4 @@ endif()
add_subdirectory(platf)

# This is the main library
add_subdirectory(displaydevice)
add_subdirectory(display_device)

4 changes: 2 additions & 2 deletions
src/common/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,8 @@
set(MODULE libcommon)

# Globing headers (so that they appear in some IDEs) and sources
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/*.h")
file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/displaydevice/detail/*.h")
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/*.h")
file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/display_device/detail/*.h")
file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp")

# Automatic library - will be static or dynamic based on user setting
Expand Down

4 changes: 2 additions & 2 deletions
src/common/file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
// class header include
#include "displaydevice/file_settings_persistence.h"
#include "display_device/file_settings_persistence.h"

// system includes
#include <algorithm>
#include <fstream>
#include <iterator>

// local includes
#include "displaydevice/logging.h"
#include "display_device/logging.h"

namespace display_device {
 FileSettingsPersistence::FileSettingsPersistence(std::filesystem::path filepath):
Expand Down

0
...e/displaydevice/audio_context_interface.h → .../display_device/audio_context_interface.h

View file


Open in desktop


File renamed without changes.


0
...ude/displaydevice/detail/json_converter.h → ...de/display_device/detail/json_converter.h

View file


Open in desktop


File renamed without changes.


0
...de/displaydevice/detail/json_serializer.h → ...e/display_device/detail/json_serializer.h

View file


Open in desktop


File renamed without changes.


0
...aydevice/detail/json_serializer_details.h → ...y_device/detail/json_serializer_details.h

View file


Open in desktop


File renamed without changes.


0
...displaydevice/file_settings_persistence.h → ...isplay_device/file_settings_persistence.h

View file


Open in desktop


File renamed without changes.


0
src/common/include/displaydevice/json.h → src/common/include/display_device/json.h

View file


Open in desktop


File renamed without changes.


0
src/common/include/displaydevice/logging.h → src/common/include/display_device/logging.h

View file


Open in desktop


File renamed without changes.


0
...nclude/displaydevice/noop_audio_context.h → ...clude/display_device/noop_audio_context.h

View file


Open in desktop


File renamed without changes.


0
...displaydevice/noop_settings_persistence.h → ...isplay_device/noop_settings_persistence.h

View file


Open in desktop


File renamed without changes.


0
...n/include/displaydevice/retry_scheduler.h → .../include/display_device/retry_scheduler.h

View file


Open in desktop


File renamed without changes.


0
...isplaydevice/settings_manager_interface.h → ...splay_device/settings_manager_interface.h

View file


Open in desktop


File renamed without changes.


0
...aydevice/settings_persistence_interface.h → ...y_device/settings_persistence_interface.h

View file


Open in desktop


File renamed without changes.


0
src/common/include/displaydevice/types.h → src/common/include/display_device/types.h

View file


Open in desktop


File renamed without changes.


6 changes: 3 additions & 3 deletions
src/common/json.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
// header include
#include "displaydevice/json.h"
#include "display_device/json.h"

// special ordered include of details
#define DD_JSON_DETAIL
// clang-format off
#include "displaydevice/detail/json_serializer.h"
#include "displaydevice/detail/json_converter.h"
#include "display_device/detail/json_serializer.h"
#include "display_device/detail/json_converter.h"
// clang-format on

namespace display_device {
Expand Down

4 changes: 2 additions & 2 deletions
src/common/json_serializer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
// special ordered include of details
#define DD_JSON_DETAIL
// clang-format off
#include "displaydevice/types.h"
#include "displaydevice/detail/json_serializer.h"
#include "display_device/types.h"
#include "display_device/detail/json_serializer.h"
// clang-format on

namespace display_device {
Expand Down

2 changes: 1 addition & 1 deletion
src/common/logging.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// class header include
#include "displaydevice/logging.h"
#include "display_device/logging.h"

// system includes
#include <chrono>
Expand Down

2 changes: 1 addition & 1 deletion
src/common/noop_audio_context.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// local includes
#include "displaydevice/noop_audio_context.h"
#include "display_device/noop_audio_context.h"

namespace display_device {
 bool
Expand Down

2 changes: 1 addition & 1 deletion
src/common/noop_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// local includes
#include "displaydevice/noop_settings_persistence.h"
#include "display_device/noop_settings_persistence.h"

namespace display_device {
 bool
Expand Down

2 changes: 1 addition & 1 deletion
src/common/retry_scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// header include
#include "displaydevice/retry_scheduler.h"
#include "display_device/retry_scheduler.h"

namespace display_device {
 SchedulerStopToken::SchedulerStopToken(std::function<void()> cleanup):
Expand Down

2 changes: 1 addition & 1 deletion
src/common/types.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// header include
#include "displaydevice/types.h"
#include "display_device/types.h"

namespace {
 bool
Expand Down

2 changes: 1 addition & 1 deletion
src/displaydevice/CMakeLists.txt → src/display_device/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
set(MODULE libdisplaydevice)

# Globing headers (so that they appear in some IDEs) and sources
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/*.h")
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/*.h")
file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp")

# Automatic library - will be static or dynamic based on user setting
Expand Down

0
.../include/displaydevice/libddplaceholder.h → ...include/display_device/libddplaceholder.h

View file


Open in desktop

@ReenigneArcherReenigneArcherJul 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename file?

File renamed without changes.


6 changes: 6 additions & 0 deletions
src/display_device/libddplaceholder.cpp

View file


Open in desktop

@ReenigneArcherReenigneArcherJul 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename file?
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
#include "display_device/libddplaceholder.h"

int
ddplaceholder() {
@ReenigneArcherReenigneArcherJul 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

ddplaceholder() {
dd_placeholder() {
Thoughts?
 return 0;
}

6 changes: 0 additions & 6 deletions
src/displaydevice/libddplaceholder.cpp

View file


Open in desktop


This file was deleted.


2 changes: 1 addition & 1 deletion
src/platf/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
set(MODULE libplatf)

# Globing headers (so that they appear in some IDEs) and sources
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/*.h")
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/*.h")
file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp")

# Automatic library - will be static or dynamic based on user setting
Expand Down

0
...clude/displaydevice/libplatfplaceholder.h → ...lude/display_device/libplatfplaceholder.h

View file


Open in desktop

@ReenigneArcherReenigneArcherJul 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename file?

File renamed without changes.


2 changes: 1 addition & 1 deletion
src/platf/libplatfplaceholder.cpp

View file


Open in desktop

@ReenigneArcherReenigneArcherJul 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename file?
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#include "displaydevice/libplatfplaceholder.h"
#include "display_device/libplatfplaceholder.h"

int
plaftplaceholder() {
Expand Down

4 changes: 2 additions & 2 deletions
src/windows/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,8 @@
set(MODULE libwindows)

# Globing headers (so that they appear in some IDEs) and sources
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/windows/*.h")
file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/displaydevice/windows/detail/*.h")
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/windows/*.h")
file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/display_device/windows/detail/*.h")
file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp")

# Automatic library - will be static or dynamic based on user setting
Expand Down

2 changes: 1 addition & 1 deletion
...aydevice/windows/detail/json_serializer.h → ...y_device/windows/detail/json_serializer.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
#pragma once

// local includes
#include "displaydevice/detail/json_serializer.h"
#include "display_device/detail/json_serializer.h"

#ifdef DD_JSON_DETAIL
namespace display_device {
Expand Down

2 changes: 1 addition & 1 deletion
...dows/include/displaydevice/windows/json.h → ...ows/include/display_device/windows/json.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
#pragma once

// local includes
#include "displaydevice/json.h"
#include "display_device/json.h"
#include "types.h"

// Windows' converters (add as needed)
Expand Down

4 changes: 2 additions & 2 deletions
.../displaydevice/windows/persistent_state.h → ...display_device/windows/persistent_state.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,8 @@
#include <memory>

// local includes
#include "displaydevice/settings_persistence_interface.h"
#include "displaydevice/windows/win_display_device_interface.h"
#include "display_device/settings_persistence_interface.h"
#include "display_device/windows/win_display_device_interface.h"

namespace display_device {
 /**
Expand Down

6 changes: 3 additions & 3 deletions
.../displaydevice/windows/settings_manager.h → ...display_device/windows/settings_manager.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,9 @@
#include <memory>

// local includes
#include "displaydevice/audio_context_interface.h"
#include "displaydevice/settings_manager_interface.h"
#include "displaydevice/windows/win_display_device_interface.h"
#include "display_device/audio_context_interface.h"
#include "display_device/settings_manager_interface.h"
#include "display_device/windows/win_display_device_interface.h"
#include "persistent_state.h"

namespace display_device {
Expand Down

0
...de/displaydevice/windows/settings_utils.h → ...e/display_device/windows/settings_utils.h

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...ows/include/displaydevice/windows/types.h → ...ws/include/display_device/windows/types.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
#include <set>

// local includes
#include "displaydevice/types.h"
#include "display_device/types.h"

namespace display_device {
 /**
Expand Down

0
...ude/displaydevice/windows/win_api_layer.h → ...de/display_device/windows/win_api_layer.h

View file


Open in desktop


File renamed without changes.


0
...ydevice/windows/win_api_layer_interface.h → ..._device/windows/win_api_layer_interface.h

View file


Open in desktop


File renamed without changes.


0
...ude/displaydevice/windows/win_api_utils.h → ...de/display_device/windows/win_api_utils.h

View file


Open in desktop


File renamed without changes.


0
...isplaydevice/windows/win_display_device.h → ...splay_device/windows/win_display_device.h

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...ce/windows/win_display_device_interface.h → ...ce/windows/win_display_device_interface.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
#include <set>

// local includes
#include "displaydevice/windows/types.h"
#include "display_device/windows/types.h"

namespace display_device {
 /**
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/json.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
// header include
#include "displaydevice/windows/json.h"
#include "display_device/windows/json.h"

// special ordered include of details
#define DD_JSON_DETAIL
// clang-format off
#include "displaydevice/windows/detail/json_serializer.h"
#include "displaydevice/detail/json_converter.h"
#include "display_device/windows/detail/json_serializer.h"
#include "display_device/detail/json_converter.h"
// clang-format on

namespace display_device {
Expand Down

4 changes: 2 additions & 2 deletions
src/windows/json_serializer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
// special ordered include of details
#define DD_JSON_DETAIL
// clang-format off
#include "displaydevice/windows/types.h"
#include "displaydevice/windows/detail/json_serializer.h"
#include "display_device/windows/types.h"
#include "display_device/windows/detail/json_serializer.h"
// clang-format on

namespace display_device {
Expand Down

8 changes: 4 additions & 4 deletions
src/windows/persistent_state.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
// class header include
#include "displaydevice/windows/persistent_state.h"
#include "display_device/windows/persistent_state.h"

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/noop_settings_persistence.h"
#include "displaydevice/windows/json.h"
#include "display_device/logging.h"
#include "display_device/noop_settings_persistence.h"
#include "display_device/windows/json.h"

namespace display_device {
 PersistentState::PersistentState(std::shared_ptr<SettingsPersistenceInterface> settings_persistence_api, const std::optional<SingleDisplayConfigState> &fallback_state):
Expand Down

8 changes: 4 additions & 4 deletions
src/windows/settings_manager_apply.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
// class header include
#include "displaydevice/windows/settings_manager.h"
#include "display_device/windows/settings_manager.h"

// system includes
#include <algorithm>
#include <boost/scope/scope_exit.hpp>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/json.h"
#include "displaydevice/windows/settings_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/json.h"
#include "display_device/windows/settings_utils.h"

namespace display_device {
 namespace {
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/settings_manager_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
// class header include
#include "displaydevice/windows/settings_manager.h"
#include "display_device/windows/settings_manager.h"

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/noop_audio_context.h"
#include "display_device/logging.h"
#include "display_device/noop_audio_context.h"

namespace display_device {
 SettingsManager::SettingsManager(
Expand Down

8 changes: 4 additions & 4 deletions
src/windows/settings_manager_revert.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
// class header include
#include "displaydevice/windows/settings_manager.h"
#include "display_device/windows/settings_manager.h"

// system includes
#include <boost/scope/scope_exit.hpp>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/json.h"
#include "displaydevice/windows/settings_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/json.h"
#include "display_device/windows/settings_utils.h"

namespace display_device {
 namespace {
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/settings_utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
// header include
#include "displaydevice/windows/settings_utils.h"
#include "display_device/windows/settings_utils.h"

// system includes
#include <algorithm>
#include <cmath>
#include <thread>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/json.h"
#include "display_device/logging.h"
#include "display_device/windows/json.h"

namespace display_device::win_utils {
 namespace {
Expand Down

2 changes: 1 addition & 1 deletion
src/windows/types.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// header include
#include "displaydevice/windows/types.h"
#include "display_device/windows/types.h"

namespace display_device {
 bool
Expand Down

4 changes: 2 additions & 2 deletions
src/windows/win_api_layer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// class header include
#include "displaydevice/windows/win_api_layer.h"
#include "display_device/windows/win_api_layer.h"

// system includes
#include <boost/algorithm/string.hpp>
Expand All@@ -12,7 +12,7 @@
#include <iomanip>

// local includes
#include "displaydevice/logging.h"
#include "display_device/logging.h"

// Windows includes after "windows.h"
#include <SetupApi.h>
Expand Down

4 changes: 2 additions & 2 deletions
src/windows/win_api_utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
// header include
#include "displaydevice/windows/win_api_utils.h"
#include "display_device/windows/win_api_utils.h"

// system includes
#include <unordered_set>

// local includes
#include "displaydevice/logging.h"
#include "display_device/logging.h"

namespace {
 /**
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/win_display_device_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
// class header include
#include "displaydevice/windows/win_display_device.h"
#include "display_device/windows/win_display_device.h"

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/win_api_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/win_api_utils.h"

namespace display_device {
 WinDisplayDevice::WinDisplayDevice(std::shared_ptr<WinApiLayerInterface> w_api):
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/win_display_device_hdr.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
// class header include
#include "displaydevice/windows/win_display_device.h"
#include "display_device/windows/win_display_device.h"

// system includes
#include <ranges>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/win_api_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/win_api_utils.h"

namespace display_device {
 namespace {
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/win_display_device_modes.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
// class header include
#include "displaydevice/windows/win_display_device.h"
#include "display_device/windows/win_display_device.h"

// system includes
#include <ranges>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/win_api_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/win_api_utils.h"

namespace display_device {
 namespace {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: Rename displaydevice directory to display_device#64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ReenigneArcher
merged 1 commit into

from

Jul 17, 2024
 Merged


feat: Rename displaydevice directory to display_device
#64
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,4 +16,4 @@ endif()
add_subdirectory(platf)

# This is the main library
add_subdirectory(displaydevice)
add_subdirectory(display_device)

4 changes: 2 additions & 2 deletions
src/common/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,8 @@
set(MODULE libcommon)

# Globing headers (so that they appear in some IDEs) and sources
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/*.h")
file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/displaydevice/detail/*.h")
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/*.h")
file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/display_device/detail/*.h")
file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp")

# Automatic library - will be static or dynamic based on user setting
Expand Down

4 changes: 2 additions & 2 deletions
src/common/file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
// class header include
#include "displaydevice/file_settings_persistence.h"
#include "display_device/file_settings_persistence.h"

// system includes
#include <algorithm>
#include <fstream>
#include <iterator>

// local includes
#include "displaydevice/logging.h"
#include "display_device/logging.h"

namespace display_device {
 FileSettingsPersistence::FileSettingsPersistence(std::filesystem::path filepath):
Expand Down

0
...e/displaydevice/audio_context_interface.h → .../display_device/audio_context_interface.h

View file


Open in desktop


File renamed without changes.


0
...ude/displaydevice/detail/json_converter.h → ...de/display_device/detail/json_converter.h

View file


Open in desktop


File renamed without changes.


0
...de/displaydevice/detail/json_serializer.h → ...e/display_device/detail/json_serializer.h

View file


Open in desktop


File renamed without changes.


0
...aydevice/detail/json_serializer_details.h → ...y_device/detail/json_serializer_details.h

View file


Open in desktop


File renamed without changes.


0
...displaydevice/file_settings_persistence.h → ...isplay_device/file_settings_persistence.h

View file


Open in desktop


File renamed without changes.


0
src/common/include/displaydevice/json.h → src/common/include/display_device/json.h

View file


Open in desktop


File renamed without changes.


0
src/common/include/displaydevice/logging.h → src/common/include/display_device/logging.h

View file


Open in desktop


File renamed without changes.


0
...nclude/displaydevice/noop_audio_context.h → ...clude/display_device/noop_audio_context.h

View file


Open in desktop


File renamed without changes.


0
...displaydevice/noop_settings_persistence.h → ...isplay_device/noop_settings_persistence.h

View file


Open in desktop


File renamed without changes.


0
...n/include/displaydevice/retry_scheduler.h → .../include/display_device/retry_scheduler.h

View file


Open in desktop


File renamed without changes.


0
...isplaydevice/settings_manager_interface.h → ...splay_device/settings_manager_interface.h

View file


Open in desktop


File renamed without changes.


0
...aydevice/settings_persistence_interface.h → ...y_device/settings_persistence_interface.h

View file


Open in desktop


File renamed without changes.


0
src/common/include/displaydevice/types.h → src/common/include/display_device/types.h

View file


Open in desktop


File renamed without changes.


6 changes: 3 additions & 3 deletions
src/common/json.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
// header include
#include "displaydevice/json.h"
#include "display_device/json.h"

// special ordered include of details
#define DD_JSON_DETAIL
// clang-format off
#include "displaydevice/detail/json_serializer.h"
#include "displaydevice/detail/json_converter.h"
#include "display_device/detail/json_serializer.h"
#include "display_device/detail/json_converter.h"
// clang-format on

namespace display_device {
Expand Down

4 changes: 2 additions & 2 deletions
src/common/json_serializer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
// special ordered include of details
#define DD_JSON_DETAIL
// clang-format off
#include "displaydevice/types.h"
#include "displaydevice/detail/json_serializer.h"
#include "display_device/types.h"
#include "display_device/detail/json_serializer.h"
// clang-format on

namespace display_device {
Expand Down

2 changes: 1 addition & 1 deletion
src/common/logging.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// class header include
#include "displaydevice/logging.h"
#include "display_device/logging.h"

// system includes
#include <chrono>
Expand Down

2 changes: 1 addition & 1 deletion
src/common/noop_audio_context.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// local includes
#include "displaydevice/noop_audio_context.h"
#include "display_device/noop_audio_context.h"

namespace display_device {
 bool
Expand Down

2 changes: 1 addition & 1 deletion
src/common/noop_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// local includes
#include "displaydevice/noop_settings_persistence.h"
#include "display_device/noop_settings_persistence.h"

namespace display_device {
 bool
Expand Down

2 changes: 1 addition & 1 deletion
src/common/retry_scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// header include
#include "displaydevice/retry_scheduler.h"
#include "display_device/retry_scheduler.h"

namespace display_device {
 SchedulerStopToken::SchedulerStopToken(std::function<void()> cleanup):
Expand Down

2 changes: 1 addition & 1 deletion
src/common/types.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// header include
#include "displaydevice/types.h"
#include "display_device/types.h"

namespace {
 bool
Expand Down

2 changes: 1 addition & 1 deletion
src/displaydevice/CMakeLists.txt → src/display_device/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
set(MODULE libdisplaydevice)

# Globing headers (so that they appear in some IDEs) and sources
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/*.h")
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/*.h")
file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp")

# Automatic library - will be static or dynamic based on user setting
Expand Down

0
.../include/displaydevice/libddplaceholder.h → ...include/display_device/libddplaceholder.h

View file


Open in desktop

@ReenigneArcherReenigneArcherJul 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename file?

File renamed without changes.


6 changes: 6 additions & 0 deletions
src/display_device/libddplaceholder.cpp

View file


Open in desktop

@ReenigneArcherReenigneArcherJul 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename file?
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
#include "display_device/libddplaceholder.h"

int
ddplaceholder() {
@ReenigneArcherReenigneArcherJul 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

ddplaceholder() {
dd_placeholder() {
Thoughts?
 return 0;
}

6 changes: 0 additions & 6 deletions
src/displaydevice/libddplaceholder.cpp

View file


Open in desktop


This file was deleted.


2 changes: 1 addition & 1 deletion
src/platf/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
set(MODULE libplatf)

# Globing headers (so that they appear in some IDEs) and sources
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/*.h")
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/*.h")
file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp")

# Automatic library - will be static or dynamic based on user setting
Expand Down

0
...clude/displaydevice/libplatfplaceholder.h → ...lude/display_device/libplatfplaceholder.h

View file


Open in desktop

@ReenigneArcherReenigneArcherJul 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename file?

File renamed without changes.


2 changes: 1 addition & 1 deletion
src/platf/libplatfplaceholder.cpp

View file


Open in desktop

@ReenigneArcherReenigneArcherJul 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename file?
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#include "displaydevice/libplatfplaceholder.h"
#include "display_device/libplatfplaceholder.h"

int
plaftplaceholder() {
Expand Down

4 changes: 2 additions & 2 deletions
src/windows/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,8 @@
set(MODULE libwindows)

# Globing headers (so that they appear in some IDEs) and sources
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/windows/*.h")
file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/displaydevice/windows/detail/*.h")
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/windows/*.h")
file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/display_device/windows/detail/*.h")
file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp")

# Automatic library - will be static or dynamic based on user setting
Expand Down

2 changes: 1 addition & 1 deletion
...aydevice/windows/detail/json_serializer.h → ...y_device/windows/detail/json_serializer.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
#pragma once

// local includes
#include "displaydevice/detail/json_serializer.h"
#include "display_device/detail/json_serializer.h"

#ifdef DD_JSON_DETAIL
namespace display_device {
Expand Down

2 changes: 1 addition & 1 deletion
...dows/include/displaydevice/windows/json.h → ...ows/include/display_device/windows/json.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
#pragma once

// local includes
#include "displaydevice/json.h"
#include "display_device/json.h"
#include "types.h"

// Windows' converters (add as needed)
Expand Down

4 changes: 2 additions & 2 deletions
.../displaydevice/windows/persistent_state.h → ...display_device/windows/persistent_state.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,8 @@
#include <memory>

// local includes
#include "displaydevice/settings_persistence_interface.h"
#include "displaydevice/windows/win_display_device_interface.h"
#include "display_device/settings_persistence_interface.h"
#include "display_device/windows/win_display_device_interface.h"

namespace display_device {
 /**
Expand Down

6 changes: 3 additions & 3 deletions
.../displaydevice/windows/settings_manager.h → ...display_device/windows/settings_manager.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,9 @@
#include <memory>

// local includes
#include "displaydevice/audio_context_interface.h"
#include "displaydevice/settings_manager_interface.h"
#include "displaydevice/windows/win_display_device_interface.h"
#include "display_device/audio_context_interface.h"
#include "display_device/settings_manager_interface.h"
#include "display_device/windows/win_display_device_interface.h"
#include "persistent_state.h"

namespace display_device {
Expand Down

0
...de/displaydevice/windows/settings_utils.h → ...e/display_device/windows/settings_utils.h

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...ows/include/displaydevice/windows/types.h → ...ws/include/display_device/windows/types.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
#include <set>

// local includes
#include "displaydevice/types.h"
#include "display_device/types.h"

namespace display_device {
 /**
Expand Down

0
...ude/displaydevice/windows/win_api_layer.h → ...de/display_device/windows/win_api_layer.h

View file


Open in desktop


File renamed without changes.


0
...ydevice/windows/win_api_layer_interface.h → ..._device/windows/win_api_layer_interface.h

View file


Open in desktop


File renamed without changes.


0
...ude/displaydevice/windows/win_api_utils.h → ...de/display_device/windows/win_api_utils.h

View file


Open in desktop


File renamed without changes.


0
...isplaydevice/windows/win_display_device.h → ...splay_device/windows/win_display_device.h

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...ce/windows/win_display_device_interface.h → ...ce/windows/win_display_device_interface.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
#include <set>

// local includes
#include "displaydevice/windows/types.h"
#include "display_device/windows/types.h"

namespace display_device {
 /**
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/json.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
// header include
#include "displaydevice/windows/json.h"
#include "display_device/windows/json.h"

// special ordered include of details
#define DD_JSON_DETAIL
// clang-format off
#include "displaydevice/windows/detail/json_serializer.h"
#include "displaydevice/detail/json_converter.h"
#include "display_device/windows/detail/json_serializer.h"
#include "display_device/detail/json_converter.h"
// clang-format on

namespace display_device {
Expand Down

4 changes: 2 additions & 2 deletions
src/windows/json_serializer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
// special ordered include of details
#define DD_JSON_DETAIL
// clang-format off
#include "displaydevice/windows/types.h"
#include "displaydevice/windows/detail/json_serializer.h"
#include "display_device/windows/types.h"
#include "display_device/windows/detail/json_serializer.h"
// clang-format on

namespace display_device {
Expand Down

8 changes: 4 additions & 4 deletions
src/windows/persistent_state.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
// class header include
#include "displaydevice/windows/persistent_state.h"
#include "display_device/windows/persistent_state.h"

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/noop_settings_persistence.h"
#include "displaydevice/windows/json.h"
#include "display_device/logging.h"
#include "display_device/noop_settings_persistence.h"
#include "display_device/windows/json.h"

namespace display_device {
 PersistentState::PersistentState(std::shared_ptr<SettingsPersistenceInterface> settings_persistence_api, const std::optional<SingleDisplayConfigState> &fallback_state):
Expand Down

8 changes: 4 additions & 4 deletions
src/windows/settings_manager_apply.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
// class header include
#include "displaydevice/windows/settings_manager.h"
#include "display_device/windows/settings_manager.h"

// system includes
#include <algorithm>
#include <boost/scope/scope_exit.hpp>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/json.h"
#include "displaydevice/windows/settings_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/json.h"
#include "display_device/windows/settings_utils.h"

namespace display_device {
 namespace {
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/settings_manager_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
// class header include
#include "displaydevice/windows/settings_manager.h"
#include "display_device/windows/settings_manager.h"

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/noop_audio_context.h"
#include "display_device/logging.h"
#include "display_device/noop_audio_context.h"

namespace display_device {
 SettingsManager::SettingsManager(
Expand Down

8 changes: 4 additions & 4 deletions
src/windows/settings_manager_revert.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
// class header include
#include "displaydevice/windows/settings_manager.h"
#include "display_device/windows/settings_manager.h"

// system includes
#include <boost/scope/scope_exit.hpp>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/json.h"
#include "displaydevice/windows/settings_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/json.h"
#include "display_device/windows/settings_utils.h"

namespace display_device {
 namespace {
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/settings_utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
// header include
#include "displaydevice/windows/settings_utils.h"
#include "display_device/windows/settings_utils.h"

// system includes
#include <algorithm>
#include <cmath>
#include <thread>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/json.h"
#include "display_device/logging.h"
#include "display_device/windows/json.h"

namespace display_device::win_utils {
 namespace {
Expand Down

2 changes: 1 addition & 1 deletion
src/windows/types.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// header include
#include "displaydevice/windows/types.h"
#include "display_device/windows/types.h"

namespace display_device {
 bool
Expand Down

4 changes: 2 additions & 2 deletions
src/windows/win_api_layer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// class header include
#include "displaydevice/windows/win_api_layer.h"
#include "display_device/windows/win_api_layer.h"

// system includes
#include <boost/algorithm/string.hpp>
Expand All@@ -12,7 +12,7 @@
#include <iomanip>

// local includes
#include "displaydevice/logging.h"
#include "display_device/logging.h"

// Windows includes after "windows.h"
#include <SetupApi.h>
Expand Down

4 changes: 2 additions & 2 deletions
src/windows/win_api_utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
// header include
#include "displaydevice/windows/win_api_utils.h"
#include "display_device/windows/win_api_utils.h"

// system includes
#include <unordered_set>

// local includes
#include "displaydevice/logging.h"
#include "display_device/logging.h"

namespace {
 /**
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/win_display_device_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
// class header include
#include "displaydevice/windows/win_display_device.h"
#include "display_device/windows/win_display_device.h"

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/win_api_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/win_api_utils.h"

namespace display_device {
 WinDisplayDevice::WinDisplayDevice(std::shared_ptr<WinApiLayerInterface> w_api):
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/win_display_device_hdr.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
// class header include
#include "displaydevice/windows/win_display_device.h"
#include "display_device/windows/win_display_device.h"

// system includes
#include <ranges>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/win_api_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/win_api_utils.h"

namespace display_device {
 namespace {
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/win_display_device_modes.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
// class header include
#include "displaydevice/windows/win_display_device.h"
#include "display_device/windows/win_display_device.h"

// system includes
#include <ranges>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/win_api_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/win_api_utils.h"

namespace display_device {
 namespace {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: Rename displaydevice directory to display_device#64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ReenigneArcher
merged 1 commit into

from

Jul 17, 2024
 Merged


feat: Rename displaydevice directory to display_device
#64
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,4 +16,4 @@ endif()
add_subdirectory(platf)

# This is the main library
add_subdirectory(displaydevice)
add_subdirectory(display_device)

4 changes: 2 additions & 2 deletions
src/common/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,8 @@
set(MODULE libcommon)

# Globing headers (so that they appear in some IDEs) and sources
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/*.h")
file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/displaydevice/detail/*.h")
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/*.h")
file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/display_device/detail/*.h")
file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp")

# Automatic library - will be static or dynamic based on user setting
Expand Down

4 changes: 2 additions & 2 deletions
src/common/file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
// class header include
#include "displaydevice/file_settings_persistence.h"
#include "display_device/file_settings_persistence.h"

// system includes
#include <algorithm>
#include <fstream>
#include <iterator>

// local includes
#include "displaydevice/logging.h"
#include "display_device/logging.h"

namespace display_device {
 FileSettingsPersistence::FileSettingsPersistence(std::filesystem::path filepath):
Expand Down

0
...e/displaydevice/audio_context_interface.h → .../display_device/audio_context_interface.h

View file


Open in desktop


File renamed without changes.


0
...ude/displaydevice/detail/json_converter.h → ...de/display_device/detail/json_converter.h

View file


Open in desktop


File renamed without changes.


0
...de/displaydevice/detail/json_serializer.h → ...e/display_device/detail/json_serializer.h

View file


Open in desktop


File renamed without changes.


0
...aydevice/detail/json_serializer_details.h → ...y_device/detail/json_serializer_details.h

View file


Open in desktop


File renamed without changes.


0
...displaydevice/file_settings_persistence.h → ...isplay_device/file_settings_persistence.h

View file


Open in desktop


File renamed without changes.


0
src/common/include/displaydevice/json.h → src/common/include/display_device/json.h

View file


Open in desktop


File renamed without changes.


0
src/common/include/displaydevice/logging.h → src/common/include/display_device/logging.h

View file


Open in desktop


File renamed without changes.


0
...nclude/displaydevice/noop_audio_context.h → ...clude/display_device/noop_audio_context.h

View file


Open in desktop


File renamed without changes.


0
...displaydevice/noop_settings_persistence.h → ...isplay_device/noop_settings_persistence.h

View file


Open in desktop


File renamed without changes.


0
...n/include/displaydevice/retry_scheduler.h → .../include/display_device/retry_scheduler.h

View file


Open in desktop


File renamed without changes.


0
...isplaydevice/settings_manager_interface.h → ...splay_device/settings_manager_interface.h

View file


Open in desktop


File renamed without changes.


0
...aydevice/settings_persistence_interface.h → ...y_device/settings_persistence_interface.h

View file


Open in desktop


File renamed without changes.


0
src/common/include/displaydevice/types.h → src/common/include/display_device/types.h

View file


Open in desktop


File renamed without changes.


6 changes: 3 additions & 3 deletions
src/common/json.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
// header include
#include "displaydevice/json.h"
#include "display_device/json.h"

// special ordered include of details
#define DD_JSON_DETAIL
// clang-format off
#include "displaydevice/detail/json_serializer.h"
#include "displaydevice/detail/json_converter.h"
#include "display_device/detail/json_serializer.h"
#include "display_device/detail/json_converter.h"
// clang-format on

namespace display_device {
Expand Down

4 changes: 2 additions & 2 deletions
src/common/json_serializer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
// special ordered include of details
#define DD_JSON_DETAIL
// clang-format off
#include "displaydevice/types.h"
#include "displaydevice/detail/json_serializer.h"
#include "display_device/types.h"
#include "display_device/detail/json_serializer.h"
// clang-format on

namespace display_device {
Expand Down

2 changes: 1 addition & 1 deletion
src/common/logging.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// class header include
#include "displaydevice/logging.h"
#include "display_device/logging.h"

// system includes
#include <chrono>
Expand Down

2 changes: 1 addition & 1 deletion
src/common/noop_audio_context.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// local includes
#include "displaydevice/noop_audio_context.h"
#include "display_device/noop_audio_context.h"

namespace display_device {
 bool
Expand Down

2 changes: 1 addition & 1 deletion
src/common/noop_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// local includes
#include "displaydevice/noop_settings_persistence.h"
#include "display_device/noop_settings_persistence.h"

namespace display_device {
 bool
Expand Down

2 changes: 1 addition & 1 deletion
src/common/retry_scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// header include
#include "displaydevice/retry_scheduler.h"
#include "display_device/retry_scheduler.h"

namespace display_device {
 SchedulerStopToken::SchedulerStopToken(std::function<void()> cleanup):
Expand Down

2 changes: 1 addition & 1 deletion
src/common/types.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// header include
#include "displaydevice/types.h"
#include "display_device/types.h"

namespace {
 bool
Expand Down

2 changes: 1 addition & 1 deletion
src/displaydevice/CMakeLists.txt → src/display_device/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
set(MODULE libdisplaydevice)

# Globing headers (so that they appear in some IDEs) and sources
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/*.h")
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/*.h")
file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp")

# Automatic library - will be static or dynamic based on user setting
Expand Down

0
.../include/displaydevice/libddplaceholder.h → ...include/display_device/libddplaceholder.h

View file


Open in desktop

@ReenigneArcherReenigneArcherJul 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename file?

File renamed without changes.


6 changes: 6 additions & 0 deletions
src/display_device/libddplaceholder.cpp

View file


Open in desktop

@ReenigneArcherReenigneArcherJul 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename file?
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
#include "display_device/libddplaceholder.h"

int
ddplaceholder() {
@ReenigneArcherReenigneArcherJul 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

ddplaceholder() {
dd_placeholder() {
Thoughts?
 return 0;
}

6 changes: 0 additions & 6 deletions
src/displaydevice/libddplaceholder.cpp

View file


Open in desktop


This file was deleted.


2 changes: 1 addition & 1 deletion
src/platf/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
set(MODULE libplatf)

# Globing headers (so that they appear in some IDEs) and sources
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/*.h")
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/*.h")
file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp")

# Automatic library - will be static or dynamic based on user setting
Expand Down

0
...clude/displaydevice/libplatfplaceholder.h → ...lude/display_device/libplatfplaceholder.h

View file


Open in desktop

@ReenigneArcherReenigneArcherJul 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename file?

File renamed without changes.


2 changes: 1 addition & 1 deletion
src/platf/libplatfplaceholder.cpp

View file


Open in desktop

@ReenigneArcherReenigneArcherJul 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename file?
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#include "displaydevice/libplatfplaceholder.h"
#include "display_device/libplatfplaceholder.h"

int
plaftplaceholder() {
Expand Down

4 changes: 2 additions & 2 deletions
src/windows/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,8 @@
set(MODULE libwindows)

# Globing headers (so that they appear in some IDEs) and sources
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/windows/*.h")
file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/displaydevice/windows/detail/*.h")
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/windows/*.h")
file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/display_device/windows/detail/*.h")
file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp")

# Automatic library - will be static or dynamic based on user setting
Expand Down

2 changes: 1 addition & 1 deletion
...aydevice/windows/detail/json_serializer.h → ...y_device/windows/detail/json_serializer.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
#pragma once

// local includes
#include "displaydevice/detail/json_serializer.h"
#include "display_device/detail/json_serializer.h"

#ifdef DD_JSON_DETAIL
namespace display_device {
Expand Down

2 changes: 1 addition & 1 deletion
...dows/include/displaydevice/windows/json.h → ...ows/include/display_device/windows/json.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
#pragma once

// local includes
#include "displaydevice/json.h"
#include "display_device/json.h"
#include "types.h"

// Windows' converters (add as needed)
Expand Down

4 changes: 2 additions & 2 deletions
.../displaydevice/windows/persistent_state.h → ...display_device/windows/persistent_state.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,8 @@
#include <memory>

// local includes
#include "displaydevice/settings_persistence_interface.h"
#include "displaydevice/windows/win_display_device_interface.h"
#include "display_device/settings_persistence_interface.h"
#include "display_device/windows/win_display_device_interface.h"

namespace display_device {
 /**
Expand Down

6 changes: 3 additions & 3 deletions
.../displaydevice/windows/settings_manager.h → ...display_device/windows/settings_manager.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,9 @@
#include <memory>

// local includes
#include "displaydevice/audio_context_interface.h"
#include "displaydevice/settings_manager_interface.h"
#include "displaydevice/windows/win_display_device_interface.h"
#include "display_device/audio_context_interface.h"
#include "display_device/settings_manager_interface.h"
#include "display_device/windows/win_display_device_interface.h"
#include "persistent_state.h"

namespace display_device {
Expand Down

0
...de/displaydevice/windows/settings_utils.h → ...e/display_device/windows/settings_utils.h

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...ows/include/displaydevice/windows/types.h → ...ws/include/display_device/windows/types.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
#include <set>

// local includes
#include "displaydevice/types.h"
#include "display_device/types.h"

namespace display_device {
 /**
Expand Down

0
...ude/displaydevice/windows/win_api_layer.h → ...de/display_device/windows/win_api_layer.h

View file


Open in desktop


File renamed without changes.


0
...ydevice/windows/win_api_layer_interface.h → ..._device/windows/win_api_layer_interface.h

View file


Open in desktop


File renamed without changes.


0
...ude/displaydevice/windows/win_api_utils.h → ...de/display_device/windows/win_api_utils.h

View file


Open in desktop


File renamed without changes.


0
...isplaydevice/windows/win_display_device.h → ...splay_device/windows/win_display_device.h

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...ce/windows/win_display_device_interface.h → ...ce/windows/win_display_device_interface.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
#include <set>

// local includes
#include "displaydevice/windows/types.h"
#include "display_device/windows/types.h"

namespace display_device {
 /**
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/json.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
// header include
#include "displaydevice/windows/json.h"
#include "display_device/windows/json.h"

// special ordered include of details
#define DD_JSON_DETAIL
// clang-format off
#include "displaydevice/windows/detail/json_serializer.h"
#include "displaydevice/detail/json_converter.h"
#include "display_device/windows/detail/json_serializer.h"
#include "display_device/detail/json_converter.h"
// clang-format on

namespace display_device {
Expand Down

4 changes: 2 additions & 2 deletions
src/windows/json_serializer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
// special ordered include of details
#define DD_JSON_DETAIL
// clang-format off
#include "displaydevice/windows/types.h"
#include "displaydevice/windows/detail/json_serializer.h"
#include "display_device/windows/types.h"
#include "display_device/windows/detail/json_serializer.h"
// clang-format on

namespace display_device {
Expand Down

8 changes: 4 additions & 4 deletions
src/windows/persistent_state.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
// class header include
#include "displaydevice/windows/persistent_state.h"
#include "display_device/windows/persistent_state.h"

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/noop_settings_persistence.h"
#include "displaydevice/windows/json.h"
#include "display_device/logging.h"
#include "display_device/noop_settings_persistence.h"
#include "display_device/windows/json.h"

namespace display_device {
 PersistentState::PersistentState(std::shared_ptr<SettingsPersistenceInterface> settings_persistence_api, const std::optional<SingleDisplayConfigState> &fallback_state):
Expand Down

8 changes: 4 additions & 4 deletions
src/windows/settings_manager_apply.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
// class header include
#include "displaydevice/windows/settings_manager.h"
#include "display_device/windows/settings_manager.h"

// system includes
#include <algorithm>
#include <boost/scope/scope_exit.hpp>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/json.h"
#include "displaydevice/windows/settings_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/json.h"
#include "display_device/windows/settings_utils.h"

namespace display_device {
 namespace {
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/settings_manager_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
// class header include
#include "displaydevice/windows/settings_manager.h"
#include "display_device/windows/settings_manager.h"

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/noop_audio_context.h"
#include "display_device/logging.h"
#include "display_device/noop_audio_context.h"

namespace display_device {
 SettingsManager::SettingsManager(
Expand Down

8 changes: 4 additions & 4 deletions
src/windows/settings_manager_revert.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
// class header include
#include "displaydevice/windows/settings_manager.h"
#include "display_device/windows/settings_manager.h"

// system includes
#include <boost/scope/scope_exit.hpp>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/json.h"
#include "displaydevice/windows/settings_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/json.h"
#include "display_device/windows/settings_utils.h"

namespace display_device {
 namespace {
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/settings_utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
// header include
#include "displaydevice/windows/settings_utils.h"
#include "display_device/windows/settings_utils.h"

// system includes
#include <algorithm>
#include <cmath>
#include <thread>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/json.h"
#include "display_device/logging.h"
#include "display_device/windows/json.h"

namespace display_device::win_utils {
 namespace {
Expand Down

2 changes: 1 addition & 1 deletion
src/windows/types.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// header include
#include "displaydevice/windows/types.h"
#include "display_device/windows/types.h"

namespace display_device {
 bool
Expand Down

4 changes: 2 additions & 2 deletions
src/windows/win_api_layer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// class header include
#include "displaydevice/windows/win_api_layer.h"
#include "display_device/windows/win_api_layer.h"

// system includes
#include <boost/algorithm/string.hpp>
Expand All@@ -12,7 +12,7 @@
#include <iomanip>

// local includes
#include "displaydevice/logging.h"
#include "display_device/logging.h"

// Windows includes after "windows.h"
#include <SetupApi.h>
Expand Down

4 changes: 2 additions & 2 deletions
src/windows/win_api_utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
// header include
#include "displaydevice/windows/win_api_utils.h"
#include "display_device/windows/win_api_utils.h"

// system includes
#include <unordered_set>

// local includes
#include "displaydevice/logging.h"
#include "display_device/logging.h"

namespace {
 /**
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/win_display_device_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
// class header include
#include "displaydevice/windows/win_display_device.h"
#include "display_device/windows/win_display_device.h"

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/win_api_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/win_api_utils.h"

namespace display_device {
 WinDisplayDevice::WinDisplayDevice(std::shared_ptr<WinApiLayerInterface> w_api):
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/win_display_device_hdr.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
// class header include
#include "displaydevice/windows/win_display_device.h"
#include "display_device/windows/win_display_device.h"

// system includes
#include <ranges>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/win_api_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/win_api_utils.h"

namespace display_device {
 namespace {
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/win_display_device_modes.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
// class header include
#include "displaydevice/windows/win_display_device.h"
#include "display_device/windows/win_display_device.h"

// system includes
#include <ranges>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/win_api_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/win_api_utils.h"

namespace display_device {
 namespace {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
feat: Rename displaydevice directory to display_device#64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ReenigneArcher
merged 1 commit into

from

Jul 17, 2024
 Merged


feat: Rename displaydevice directory to display_device
#64
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,4 +16,4 @@ endif()
add_subdirectory(platf)

# This is the main library
add_subdirectory(displaydevice)
add_subdirectory(display_device)

4 changes: 2 additions & 2 deletions
src/common/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,8 @@
set(MODULE libcommon)

# Globing headers (so that they appear in some IDEs) and sources
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/*.h")
file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/displaydevice/detail/*.h")
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/*.h")
file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/display_device/detail/*.h")
file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp")

# Automatic library - will be static or dynamic based on user setting
Expand Down

4 changes: 2 additions & 2 deletions
src/common/file_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
// class header include
#include "displaydevice/file_settings_persistence.h"
#include "display_device/file_settings_persistence.h"

// system includes
#include <algorithm>
#include <fstream>
#include <iterator>

// local includes
#include "displaydevice/logging.h"
#include "display_device/logging.h"

namespace display_device {
 FileSettingsPersistence::FileSettingsPersistence(std::filesystem::path filepath):
Expand Down

0
...e/displaydevice/audio_context_interface.h → .../display_device/audio_context_interface.h

View file


Open in desktop


File renamed without changes.


0
...ude/displaydevice/detail/json_converter.h → ...de/display_device/detail/json_converter.h

View file


Open in desktop


File renamed without changes.


0
...de/displaydevice/detail/json_serializer.h → ...e/display_device/detail/json_serializer.h

View file


Open in desktop


File renamed without changes.


0
...aydevice/detail/json_serializer_details.h → ...y_device/detail/json_serializer_details.h

View file


Open in desktop


File renamed without changes.


0
...displaydevice/file_settings_persistence.h → ...isplay_device/file_settings_persistence.h

View file


Open in desktop


File renamed without changes.


0
src/common/include/displaydevice/json.h → src/common/include/display_device/json.h

View file


Open in desktop


File renamed without changes.


0
src/common/include/displaydevice/logging.h → src/common/include/display_device/logging.h

View file


Open in desktop


File renamed without changes.


0
...nclude/displaydevice/noop_audio_context.h → ...clude/display_device/noop_audio_context.h

View file


Open in desktop


File renamed without changes.


0
...displaydevice/noop_settings_persistence.h → ...isplay_device/noop_settings_persistence.h

View file


Open in desktop


File renamed without changes.


0
...n/include/displaydevice/retry_scheduler.h → .../include/display_device/retry_scheduler.h

View file


Open in desktop


File renamed without changes.


0
...isplaydevice/settings_manager_interface.h → ...splay_device/settings_manager_interface.h

View file


Open in desktop


File renamed without changes.


0
...aydevice/settings_persistence_interface.h → ...y_device/settings_persistence_interface.h

View file


Open in desktop


File renamed without changes.


0
src/common/include/displaydevice/types.h → src/common/include/display_device/types.h

View file


Open in desktop


File renamed without changes.


6 changes: 3 additions & 3 deletions
src/common/json.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
// header include
#include "displaydevice/json.h"
#include "display_device/json.h"

// special ordered include of details
#define DD_JSON_DETAIL
// clang-format off
#include "displaydevice/detail/json_serializer.h"
#include "displaydevice/detail/json_converter.h"
#include "display_device/detail/json_serializer.h"
#include "display_device/detail/json_converter.h"
// clang-format on

namespace display_device {
Expand Down

4 changes: 2 additions & 2 deletions
src/common/json_serializer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
// special ordered include of details
#define DD_JSON_DETAIL
// clang-format off
#include "displaydevice/types.h"
#include "displaydevice/detail/json_serializer.h"
#include "display_device/types.h"
#include "display_device/detail/json_serializer.h"
// clang-format on

namespace display_device {
Expand Down

2 changes: 1 addition & 1 deletion
src/common/logging.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// class header include
#include "displaydevice/logging.h"
#include "display_device/logging.h"

// system includes
#include <chrono>
Expand Down

2 changes: 1 addition & 1 deletion
src/common/noop_audio_context.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// local includes
#include "displaydevice/noop_audio_context.h"
#include "display_device/noop_audio_context.h"

namespace display_device {
 bool
Expand Down

2 changes: 1 addition & 1 deletion
src/common/noop_settings_persistence.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// local includes
#include "displaydevice/noop_settings_persistence.h"
#include "display_device/noop_settings_persistence.h"

namespace display_device {
 bool
Expand Down

2 changes: 1 addition & 1 deletion
src/common/retry_scheduler.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// header include
#include "displaydevice/retry_scheduler.h"
#include "display_device/retry_scheduler.h"

namespace display_device {
 SchedulerStopToken::SchedulerStopToken(std::function<void()> cleanup):
Expand Down

2 changes: 1 addition & 1 deletion
src/common/types.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// header include
#include "displaydevice/types.h"
#include "display_device/types.h"

namespace {
 bool
Expand Down

2 changes: 1 addition & 1 deletion
src/displaydevice/CMakeLists.txt → src/display_device/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
set(MODULE libdisplaydevice)

# Globing headers (so that they appear in some IDEs) and sources
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/*.h")
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/*.h")
file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp")

# Automatic library - will be static or dynamic based on user setting
Expand Down

0
.../include/displaydevice/libddplaceholder.h → ...include/display_device/libddplaceholder.h

View file


Open in desktop

@ReenigneArcherReenigneArcherJul 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename file?

File renamed without changes.


6 changes: 6 additions & 0 deletions
src/display_device/libddplaceholder.cpp

View file


Open in desktop

@ReenigneArcherReenigneArcherJul 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename file?
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
#include "display_device/libddplaceholder.h"

int
ddplaceholder() {
@ReenigneArcherReenigneArcherJul 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

ddplaceholder() {
dd_placeholder() {
Thoughts?
 return 0;
}

6 changes: 0 additions & 6 deletions
src/displaydevice/libddplaceholder.cpp

View file


Open in desktop


This file was deleted.


2 changes: 1 addition & 1 deletion
src/platf/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
set(MODULE libplatf)

# Globing headers (so that they appear in some IDEs) and sources
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/*.h")
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/*.h")
file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp")

# Automatic library - will be static or dynamic based on user setting
Expand Down

0
...clude/displaydevice/libplatfplaceholder.h → ...lude/display_device/libplatfplaceholder.h

View file


Open in desktop

@ReenigneArcherReenigneArcherJul 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename file?

File renamed without changes.


2 changes: 1 addition & 1 deletion
src/platf/libplatfplaceholder.cpp

View file


Open in desktop

@ReenigneArcherReenigneArcherJul 17, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename file?
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#include "displaydevice/libplatfplaceholder.h"
#include "display_device/libplatfplaceholder.h"

int
plaftplaceholder() {
Expand Down

4 changes: 2 additions & 2 deletions
src/windows/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,8 @@
set(MODULE libwindows)

# Globing headers (so that they appear in some IDEs) and sources
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/windows/*.h")
file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/displaydevice/windows/detail/*.h")
file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/windows/*.h")
file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/display_device/windows/detail/*.h")
file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp")

# Automatic library - will be static or dynamic based on user setting
Expand Down

2 changes: 1 addition & 1 deletion
...aydevice/windows/detail/json_serializer.h → ...y_device/windows/detail/json_serializer.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
#pragma once

// local includes
#include "displaydevice/detail/json_serializer.h"
#include "display_device/detail/json_serializer.h"

#ifdef DD_JSON_DETAIL
namespace display_device {
Expand Down

2 changes: 1 addition & 1 deletion
...dows/include/displaydevice/windows/json.h → ...ows/include/display_device/windows/json.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
#pragma once

// local includes
#include "displaydevice/json.h"
#include "display_device/json.h"
#include "types.h"

// Windows' converters (add as needed)
Expand Down

4 changes: 2 additions & 2 deletions
.../displaydevice/windows/persistent_state.h → ...display_device/windows/persistent_state.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,8 @@
#include <memory>

// local includes
#include "displaydevice/settings_persistence_interface.h"
#include "displaydevice/windows/win_display_device_interface.h"
#include "display_device/settings_persistence_interface.h"
#include "display_device/windows/win_display_device_interface.h"

namespace display_device {
 /**
Expand Down

6 changes: 3 additions & 3 deletions
.../displaydevice/windows/settings_manager.h → ...display_device/windows/settings_manager.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,9 @@
#include <memory>

// local includes
#include "displaydevice/audio_context_interface.h"
#include "displaydevice/settings_manager_interface.h"
#include "displaydevice/windows/win_display_device_interface.h"
#include "display_device/audio_context_interface.h"
#include "display_device/settings_manager_interface.h"
#include "display_device/windows/win_display_device_interface.h"
#include "persistent_state.h"

namespace display_device {
Expand Down

0
...de/displaydevice/windows/settings_utils.h → ...e/display_device/windows/settings_utils.h

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...ows/include/displaydevice/windows/types.h → ...ws/include/display_device/windows/types.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
#include <set>

// local includes
#include "displaydevice/types.h"
#include "display_device/types.h"

namespace display_device {
 /**
Expand Down

0
...ude/displaydevice/windows/win_api_layer.h → ...de/display_device/windows/win_api_layer.h

View file


Open in desktop


File renamed without changes.


0
...ydevice/windows/win_api_layer_interface.h → ..._device/windows/win_api_layer_interface.h

View file


Open in desktop


File renamed without changes.


0
...ude/displaydevice/windows/win_api_utils.h → ...de/display_device/windows/win_api_utils.h

View file


Open in desktop


File renamed without changes.


0
...isplaydevice/windows/win_display_device.h → ...splay_device/windows/win_display_device.h

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...ce/windows/win_display_device_interface.h → ...ce/windows/win_display_device_interface.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
#include <set>

// local includes
#include "displaydevice/windows/types.h"
#include "display_device/windows/types.h"

namespace display_device {
 /**
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/json.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
// header include
#include "displaydevice/windows/json.h"
#include "display_device/windows/json.h"

// special ordered include of details
#define DD_JSON_DETAIL
// clang-format off
#include "displaydevice/windows/detail/json_serializer.h"
#include "displaydevice/detail/json_converter.h"
#include "display_device/windows/detail/json_serializer.h"
#include "display_device/detail/json_converter.h"
// clang-format on

namespace display_device {
Expand Down

4 changes: 2 additions & 2 deletions
src/windows/json_serializer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
// special ordered include of details
#define DD_JSON_DETAIL
// clang-format off
#include "displaydevice/windows/types.h"
#include "displaydevice/windows/detail/json_serializer.h"
#include "display_device/windows/types.h"
#include "display_device/windows/detail/json_serializer.h"
// clang-format on

namespace display_device {
Expand Down

8 changes: 4 additions & 4 deletions
src/windows/persistent_state.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
// class header include
#include "displaydevice/windows/persistent_state.h"
#include "display_device/windows/persistent_state.h"

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/noop_settings_persistence.h"
#include "displaydevice/windows/json.h"
#include "display_device/logging.h"
#include "display_device/noop_settings_persistence.h"
#include "display_device/windows/json.h"

namespace display_device {
 PersistentState::PersistentState(std::shared_ptr<SettingsPersistenceInterface> settings_persistence_api, const std::optional<SingleDisplayConfigState> &fallback_state):
Expand Down

8 changes: 4 additions & 4 deletions
src/windows/settings_manager_apply.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
// class header include
#include "displaydevice/windows/settings_manager.h"
#include "display_device/windows/settings_manager.h"

// system includes
#include <algorithm>
#include <boost/scope/scope_exit.hpp>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/json.h"
#include "displaydevice/windows/settings_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/json.h"
#include "display_device/windows/settings_utils.h"

namespace display_device {
 namespace {
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/settings_manager_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
// class header include
#include "displaydevice/windows/settings_manager.h"
#include "display_device/windows/settings_manager.h"

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/noop_audio_context.h"
#include "display_device/logging.h"
#include "display_device/noop_audio_context.h"

namespace display_device {
 SettingsManager::SettingsManager(
Expand Down

8 changes: 4 additions & 4 deletions
src/windows/settings_manager_revert.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
// class header include
#include "displaydevice/windows/settings_manager.h"
#include "display_device/windows/settings_manager.h"

// system includes
#include <boost/scope/scope_exit.hpp>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/json.h"
#include "displaydevice/windows/settings_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/json.h"
#include "display_device/windows/settings_utils.h"

namespace display_device {
 namespace {
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/settings_utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
// header include
#include "displaydevice/windows/settings_utils.h"
#include "display_device/windows/settings_utils.h"

// system includes
#include <algorithm>
#include <cmath>
#include <thread>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/json.h"
#include "display_device/logging.h"
#include "display_device/windows/json.h"

namespace display_device::win_utils {
 namespace {
Expand Down

2 changes: 1 addition & 1 deletion
src/windows/types.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// header include
#include "displaydevice/windows/types.h"
#include "display_device/windows/types.h"

namespace display_device {
 bool
Expand Down

4 changes: 2 additions & 2 deletions
src/windows/win_api_layer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// class header include
#include "displaydevice/windows/win_api_layer.h"
#include "display_device/windows/win_api_layer.h"

// system includes
#include <boost/algorithm/string.hpp>
Expand All@@ -12,7 +12,7 @@
#include <iomanip>

// local includes
#include "displaydevice/logging.h"
#include "display_device/logging.h"

// Windows includes after "windows.h"
#include <SetupApi.h>
Expand Down

4 changes: 2 additions & 2 deletions
src/windows/win_api_utils.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
// header include
#include "displaydevice/windows/win_api_utils.h"
#include "display_device/windows/win_api_utils.h"

// system includes
#include <unordered_set>

// local includes
#include "displaydevice/logging.h"
#include "display_device/logging.h"

namespace {
 /**
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/win_display_device_general.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
// class header include
#include "displaydevice/windows/win_display_device.h"
#include "display_device/windows/win_display_device.h"

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/win_api_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/win_api_utils.h"

namespace display_device {
 WinDisplayDevice::WinDisplayDevice(std::shared_ptr<WinApiLayerInterface> w_api):
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/win_display_device_hdr.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
// class header include
#include "displaydevice/windows/win_display_device.h"
#include "display_device/windows/win_display_device.h"

// system includes
#include <ranges>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/win_api_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/win_api_utils.h"

namespace display_device {
 namespace {
Expand Down

6 changes: 3 additions & 3 deletions
src/windows/win_display_device_modes.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
// class header include
#include "displaydevice/windows/win_display_device.h"
#include "display_device/windows/win_display_device.h"

// system includes
#include <ranges>

// local includes
#include "displaydevice/logging.h"
#include "displaydevice/windows/win_api_utils.h"
#include "display_device/logging.h"
#include "display_device/windows/win_api_utils.h"

namespace display_device {
 namespace {
Expand Down
Loading