Browse Source

modules: include vlc_configuration.h when using config_Put/GetXXX

pull/162/head
Steve Lhomme 3 years ago
parent
commit
cfe74be120
  1. 1
      modules/audio_output/auhal.c
  2. 1
      modules/audio_output/volume.h
  3. 1
      modules/audio_output/waveout.c
  4. 1
      modules/control/hotkeys.c
  5. 1
      modules/gui/macosx/coreinteraction/VLCHotkeysController.m
  6. 1
      modules/gui/macosx/extensions/NSString+Helpers.m
  7. 4
      modules/gui/macosx/library/VLCLibraryCollectionViewItem.m
  8. 11
      modules/gui/macosx/library/VLCLibraryWindow.m
  9. 2
      modules/gui/macosx/library/media-source/VLCMediaSourceCollectionViewItem.m
  10. 2
      modules/gui/macosx/main/VLCApplication.m
  11. 1
      modules/gui/macosx/main/VLCMain+OldPrefs.m
  12. 3
      modules/gui/macosx/menus/VLCMainMenu.m
  13. 4
      modules/gui/macosx/menus/VLCStatusBarIcon.m
  14. 2
      modules/gui/macosx/os-integration/VLCClickerManager.m
  15. 1
      modules/gui/macosx/panels/VLCVideoEffectsWindowController.m
  16. 2
      modules/gui/macosx/panels/dialogs/VLCResumeDialogController.m
  17. 2
      modules/gui/macosx/playlist/VLCPlaybackContinuityController.m
  18. 3
      modules/gui/macosx/playlist/VLCPlayerController.m
  19. 2
      modules/gui/macosx/playlist/VLCPlaylistTableCellView.m
  20. 1
      modules/gui/macosx/preferences/VLCSimplePrefsController.m
  21. 1
      modules/gui/macosx/preferences/prefs_widgets.m
  22. 1
      modules/gui/macosx/windows/VLCOpenWindowController.m
  23. 2
      modules/gui/macosx/windows/convertandsave/VLCOutput.m
  24. 13
      modules/gui/macosx/windows/video/VLCVideoOutputProvider.m
  25. 2
      modules/gui/macosx/windows/video/VLCVideoWindowCommon.m
  26. 2
      modules/gui/qt/dialogs/errors/errors.cpp
  27. 1
      modules/gui/qt/dialogs/extended/extended.cpp
  28. 1
      modules/gui/skins2/src/skin_main.cpp
  29. 1
      modules/gui/skins2/src/theme.cpp
  30. 1
      modules/gui/skins2/src/theme_loader.cpp
  31. 1
      modules/gui/skins2/src/theme_repository.cpp
  32. 1
      modules/gui/skins2/vars/volume.cpp
  33. 1
      modules/services_discovery/podcast.c

1
modules/audio_output/auhal.c

@ -26,6 +26,7 @@
#include "coreaudio_common.h"
#include <vlc_configuration.h>
#include <vlc_plugin.h>
#include <vlc_threads.h>
#include <vlc_dialog.h> // vlc_dialog_display_error

1
modules/audio_output/volume.h

@ -24,6 +24,7 @@
#include <stdio.h>
#include <math.h>
#include <vlc_common.h>
#include <vlc_configuration.h>
#include <vlc_aout.h>
#define add_sw_gain() \

1
modules/audio_output/waveout.c

@ -35,6 +35,7 @@
# define UNICODE
#endif
#include <vlc_common.h>
#include <vlc_configuration.h>
#include <vlc_plugin.h>
#include <vlc_aout.h>
#include <vlc_charset.h> /* FromWide() */

1
modules/control/hotkeys.c

@ -29,6 +29,7 @@
#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS
#include <vlc_common.h>
#include <vlc_arrays.h>
#include <vlc_configuration.h>
#include <vlc_plugin.h>
#include <vlc_interface.h>
#include <vlc_input_item.h>

1
modules/gui/macosx/coreinteraction/VLCHotkeysController.m

@ -29,6 +29,7 @@
#import "playlist/VLCPlaylistController.h"
#import "playlist/VLCPlayerController.h"
#import <vlc_configuration.h>
#import <vlc_actions.h>
#import <vlc_plugin.h>
#import <vlc_modules.h>

1
modules/gui/macosx/extensions/NSString+Helpers.m

@ -27,6 +27,7 @@
#import "NSString+Helpers.h"
#import <vlc_configuration.h>
#import <vlc_strings.h>
#import <vlc_actions.h>

4
modules/gui/macosx/library/VLCLibraryCollectionViewItem.m

@ -40,6 +40,8 @@
#import "views/VLCLinearProgressIndicator.h"
#import "views/VLCTrackingView.h"
#import <vlc_configuration.h>
NSString *VLCLibraryCellIdentifier = @"VLCLibraryCellIdentifier";
const CGFloat VLCLibraryCollectionViewItemMinimalDisplayedProgress = 0.05;
const CGFloat VLCLibraryCollectionViewItemMaximumDisplayedProgress = 0.95;
@ -218,7 +220,7 @@ const CGFloat VLCLibraryCollectionViewItemMaximumDisplayedProgress = 0.95;
if (updatedMediaItem == nil || _representedItem == nil || ![_representedItem isKindOfClass:[VLCMediaLibraryMediaItem class]]) {
return;
}
VLCMediaLibraryMediaItem *mediaItem = (VLCMediaLibraryMediaItem *)_representedItem;
if(mediaItem && updatedMediaItem.libraryID == mediaItem.libraryID) {
[self updateRepresentation];

11
modules/gui/macosx/library/VLCLibraryWindow.m

@ -70,6 +70,7 @@
#import "windows/VLCOpenInputMetadata.h"
#import <vlc_common.h>
#import <vlc_configuration.h>
#import <vlc_url.h>
const CGFloat VLCLibraryWindowMinimalWidth = 604.;
@ -81,7 +82,7 @@ const NSUserInterfaceItemIdentifier VLCLibraryWindowIdentifier = @"VLCLibraryWin
@interface VLCLibraryWindow () <VLCDragDropTarget, NSSplitViewDelegate>
{
CGFloat _lastPlaylistWidthBeforeCollaps;
NSInteger _currentSelectedSegment;
NSInteger _currentSelectedViewModeSegment;
}
@ -141,7 +142,7 @@ static void addShadow(NSImageView *__unsafe_unretained imageView)
}
self.toolbar.allowsUserCustomization = NO;
VLCMain *mainInstance = [VLCMain sharedInstance];
_playlistController = [mainInstance playlistController];
@ -196,7 +197,7 @@ static void addShadow(NSImageView *__unsafe_unretained imageView)
forKeyPath:@"effectiveAppearance"
options:NSKeyValueObservingOptionNew
context:nil];
_mediaToolBar.centeredItemIdentifier = _segmentedTitleControlToolbarItem.itemIdentifier;
}
@ -842,9 +843,9 @@ static void addShadow(NSImageView *__unsafe_unretained imageView)
for (NSView *subview in _libraryTargetView.subviews) {
[subview removeFromSuperview];
}
NSLog(@"Presenting video view in main library window.");
NSView *videoView = self.videoViewController.view;
videoView.translatesAutoresizingMaskIntoConstraints = NO;
videoView.hidden = NO;

2
modules/gui/macosx/library/media-source/VLCMediaSourceCollectionViewItem.m

@ -40,6 +40,8 @@
#import "views/VLCImageView.h"
#import "views/VLCTrackingView.h"
#import <vlc_configuration.h>
NSString *VLCMediaSourceCellIdentifier = @"VLCLibraryCellIdentifier";
@interface VLCMediaSourceCollectionViewItem()

2
modules/gui/macosx/main/VLCApplication.m

@ -30,6 +30,8 @@
#import "VLCApplication.h"
#import "extensions/NSString+Helpers.h"
#import <vlc_configuration.h>
/*****************************************************************************
* VLCApplication implementation
*****************************************************************************/

1
modules/gui/macosx/main/VLCMain+OldPrefs.m

@ -26,6 +26,7 @@
#include <unistd.h> /* execl() */
#import <vlc_configuration.h>
#import <vlc_interface.h>
#import "extensions/NSString+Helpers.h"

3
modules/gui/macosx/menus/VLCMainMenu.m

@ -59,6 +59,7 @@
#import "windows/video/VLCVoutView.h"
#import "windows/video/VLCVideoOutputProvider.h"
#import <vlc_configuration.h>
#import <vlc_interface.h>
#ifdef HAVE_SPARKLE
@ -1868,7 +1869,7 @@ typedef NS_ENUM(NSInteger, VLCObjectType) {
const int menuItemOffset = 14;
const int menuItemOffsetWithActiveState = 24;
dispatch_async(dispatch_get_main_queue(), ^{
if (menu == self->_controlsMenu) {
BOOL controlsMenuHasActiveState = NO;

4
modules/gui/macosx/menus/VLCStatusBarIcon.m

@ -30,6 +30,8 @@
#import "library/VLCInputItem.h"
#import "windows/VLCDetachedAudioWindow.h"
#import <vlc_configuration.h>
@interface VLCStatusBarIcon ()
{
NSMenuItem *_vlcStatusBarMenuItem;
@ -103,7 +105,7 @@
// Set our selves up as delegate, to receive menuNeedsUpdate messages, so
// we can update our menu as needed/before it's drawn
[_vlcStatusBarIconMenu setDelegate:self];
// Register notifications
NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
[notificationCenter addObserver:self

2
modules/gui/macosx/os-integration/VLCClickerManager.m

@ -30,6 +30,8 @@
#import "playlist/VLCPlayerController.h"
#import "os-integration/VLCSystemVolume.h"
#import <vlc_configuration.h>
@interface VLCClickerManager()
{
VLCPlaylistController *_playlistController;

1
modules/gui/macosx/panels/VLCVideoEffectsWindowController.m

@ -32,6 +32,7 @@
#import "playlist/VLCPlaylistController.h"
#import "playlist/VLCPlayerController.h"
#import "windows/video/VLCVideoOutputProvider.h"
#import <vlc_configuration.h>
#define getWidgetBoolValue(w) ((vlc_value_t){ .b_bool = [w state] })

2
modules/gui/macosx/panels/dialogs/VLCResumeDialogController.m

@ -30,6 +30,8 @@
#import "library/VLCInputItem.h"
#import "views/VLCWrappableTextField.h"
#import <vlc_configuration.h>
@interface VLCResumeDialogController()
{
int _currentResumeTimeout;

2
modules/gui/macosx/playlist/VLCPlaybackContinuityController.m

@ -31,6 +31,8 @@
#import "library/VLCInputItem.h"
#import "library/VLCLibraryDataTypes.h"
#import <vlc_configuration.h>
static const int64_t SecInMillisecs = 1000;
static const int64_t MinInMillisecs = SecInMillisecs * 60;
static const int64_t MinimumDuration = 3 * MinInMillisecs;

3
modules/gui/macosx/playlist/VLCPlayerController.m

@ -22,6 +22,7 @@
#import "VLCPlayerController.h"
#import <vlc_configuration.h>
#import <vlc_url.h>
#import "extensions/NSString+Helpers.h"
@ -608,7 +609,7 @@ static int BossCallback(vlc_object_t *p_this,
_playerVoutListenerID = vlc_player_vout_AddListener(_p_player,
&player_vout_callbacks,
(__bridge void *)self);
_volume = VLCVolumeDefault;
libvlc_int_t *libvlc = vlc_object_instance(getIntf());

2
modules/gui/macosx/playlist/VLCPlaylistTableCellView.m

@ -33,6 +33,8 @@
#import "views/VLCImageView.h"
#import <vlc_configuration.h>
@interface VLCPlaylistTableCellView ()
{
NSFont *_displayedFont;

1
modules/gui/macosx/preferences/VLCSimplePrefsController.m

@ -31,6 +31,7 @@
#import <Sparkle/Sparkle.h> //for o_intf_last_updateLabel
#endif
#import <vlc_configuration.h>
#import <vlc_actions.h>
#import <vlc_interface.h>
#import <vlc_dialog.h>

1
modules/gui/macosx/preferences/prefs_widgets.m

@ -32,6 +32,7 @@
#endif
#include <vlc_common.h>
#include <vlc_configuration.h>
#include <vlc_modules.h>
#include <vlc_plugin.h>
#include <vlc_actions.h>

1
modules/gui/macosx/windows/VLCOpenWindowController.m

@ -30,6 +30,7 @@
#import <AVFoundation/AVFoundation.h>
#import <vlc_common.h>
#import <vlc_configuration.h>
#import <vlc_url.h>
#import "extensions/NSString+Helpers.h"

2
modules/gui/macosx/windows/convertandsave/VLCOutput.m

@ -29,6 +29,8 @@
#import "extensions/NSString+Helpers.h"
#import "main/VLCMain.h"
#import <vlc_configuration.h>
@interface VLCOutput()
{
NSString *_transcode;

13
modules/gui/macosx/windows/video/VLCVideoOutputProvider.m

@ -44,6 +44,7 @@
#import "windows/video/VLCMainVideoViewController.h"
#import "windows/video/VLCVoutView.h"
#include <vlc_configuration.h>
#include <vlc_vout_display.h>
NSString *VLCWindowShouldUpdateLevel = @"VLCWindowShouldUpdateLevel";
@ -236,7 +237,7 @@ int WindowOpen(vlc_window_t *p_wnd)
VLCVideoWindowCommon *newVideoWindow = [[VLCVideoWindowCommon alloc] initWithContentRect:window_rect styleMask:mask backing:NSBackingStoreBuffered defer:YES];
newVideoWindow.delegate = newVideoWindow;
newVideoWindow.releasedWhenClosed = NO;
newVideoWindow.releasedWhenClosed = NO;
newVideoWindow.backgroundColor = [NSColor blackColor];
newVideoWindow.canBecomeKeyWindow = !asVideoWallpaper;
@ -329,12 +330,12 @@ int WindowOpen(vlc_window_t *p_wnd)
if ((videoWallpaper || !windowDecorations) && !isNativeFullscreen) {
return [self borderlessVideoWindowAsVideoWallpaper:videoWallpaper withWindowDecorations:windowDecorations];
}
BOOL isEmbedded = var_InheritBool(getIntf(), "embedded-video") && !b_mainWindowHasVideo;
if (isEmbedded) {
return [self setupMainLibraryVideoWindow];
}
return [self setupDetachedVideoWindow];
}
@ -369,7 +370,7 @@ int WindowOpen(vlc_window_t *p_wnd)
BOOL isEmbedded = [videoWindow isKindOfClass:[VLCLibraryWindow class]];
BOOL multipleVoutWindows = _voutWindows.count > 0;
NSSize videoViewSize = NSMakeSize(videoViewPosition.size.width, videoViewPosition.size.height);
// set (only!) window origin if specified
if (!isEmbedded) {
if ([videoWindow isKindOfClass:[VLCAspectRatioRetainingVideoWindow class]]) {
@ -392,7 +393,7 @@ int WindowOpen(vlc_window_t *p_wnd)
withVlcWindow:(vlc_window_t *)p_wnd
{
VLCVoutView *voutView = videoWindow.videoViewController.voutView;
[videoWindow setAlphaValue:config_GetFloat("macosx-opaqueness")];
[_voutWindows setObject:videoWindow forKey:[NSValue valueWithPointer:p_wnd]];
[voutView setVoutThread:(vout_thread_t *)vlc_object_parent(p_wnd)];
@ -410,7 +411,7 @@ int WindowOpen(vlc_window_t *p_wnd)
char *psz_splitter = var_GetString(voutView.voutThread, "video-splitter");
BOOL b_have_splitter = psz_splitter != NULL && strcmp(psz_splitter, "none");
free(psz_splitter);
BOOL multipleVoutWindows = _voutWindows.count > 0;
BOOL videoWallpaper = var_InheritBool(getIntf(), "video-wallpaper") && !multipleVoutWindows;

2
modules/gui/macosx/windows/video/VLCVideoWindowCommon.m

@ -39,6 +39,8 @@
#import "windows/video/VLCVideoOutputProvider.h"
#import "windows/video/VLCVoutView.h"
#import <vlc_configuration.h>
const CGFloat VLCVideoWindowCommonMinimalHeight = 70.;
NSString *VLCVideoWindowShouldShowFullscreenController = @"VLCVideoWindowShouldShowFullscreenController";
NSString *VLCVideoWindowDidEnterFullscreen = @"VLCVideoWindowDidEnterFullscreen";

2
modules/gui/qt/dialogs/errors/errors.cpp

@ -33,6 +33,8 @@
#include <QDialogButtonBox>
#include <QPushButton>
#include <vlc_configuration.h>
ErrorsDialog::ErrorsDialog( qt_intf_t *_p_intf )
: QVLCDialog( nullptr, _p_intf )
{

1
modules/gui/qt/dialogs/extended/extended.cpp

@ -36,6 +36,7 @@
#include <QDialogButtonBox>
#include <QPushButton>
#include <QWindow>
#include <vlc_configuration.h>
#include <vlc_modules.h>
ExtendedDialog::ExtendedDialog( qt_intf_t *_p_intf )

1
modules/gui/skins2/src/skin_main.cpp

@ -29,6 +29,7 @@
#include <atomic>
#include <vlc_common.h>
#include <vlc_configuration.h>
#include <vlc_plugin.h>
#include <vlc_playlist.h>
#include <vlc_threads.h>

1
modules/gui/skins2/src/theme.cpp

@ -23,6 +23,7 @@
#include "theme.hpp"
#include "top_window.hpp"
#include <vlc_configuration.h>
#include <sstream>

1
modules/gui/skins2/src/theme_loader.cpp

@ -32,6 +32,7 @@
#include <memory>
#include <vlc_common.h>
#include <vlc_configuration.h>
#include <vlc_fs.h>
#include <vlc_url.h>
#include <vlc_stream_extractor.h>

1
modules/gui/skins2/src/theme_repository.cpp

@ -27,6 +27,7 @@
#include <unistd.h>
#include <sys/stat.h>
#include <vlc_configuration.h>
#include <vlc_fs.h>

1
modules/gui/skins2/vars/volume.cpp

@ -27,6 +27,7 @@
#endif
#include <vlc_common.h>
#include <vlc_configuration.h>
#include <vlc_player.h>
#include <vlc_playlist.h>
#include <vlc_aout.h>

1
modules/services_discovery/podcast.c

@ -31,6 +31,7 @@
#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS
#include <vlc_common.h>
#include <vlc_arrays.h>
#include <vlc_configuration.h>
#include <vlc_plugin.h>
#include <vlc_services_discovery.h>
#include <vlc_network.h>

Loading…
Cancel
Save