diff options
| author | Lars-Dominik Braun <lars@6xq.net> | 2017-03-25 12:30:33 +0100 |
|---|---|---|
| committer | Michał Cichoń <michcic@gmail.com> | 2017-05-17 04:37:39 +0200 |
| commit | 21b167532b07f631b107968837dcfdf93025239b (patch) | |
| tree | 77fc64840d2dabd15a55861c4eac9c23c03bb82b /src/player/backends | |
| parent | a0f2fe714a64c88fb86a9fa09c5a5918e7f30d7a (diff) | |
| download | pianobar-windows-21b167532b07f631b107968837dcfdf93025239b.tar.gz pianobar-windows-21b167532b07f631b107968837dcfdf93025239b.tar.bz2 pianobar-windows-21b167532b07f631b107968837dcfdf93025239b.zip | |
Switch to #pragma once
# Conflicts:
# src/http/http.h
# src/player.h
Diffstat (limited to 'src/player/backends')
| -rw-r--r-- | src/player/backends/media_foundation.h | 7 | ||||
| -rw-r--r-- | src/player/backends/utility/com_ptr.h | 4 | ||||
| -rw-r--r-- | src/player/backends/utility/optional.h | 5 |
3 files changed, 1 insertions, 15 deletions
diff --git a/src/player/backends/media_foundation.h b/src/player/backends/media_foundation.h index cf10122..6ad4966 100644 --- a/src/player/backends/media_foundation.h +++ b/src/player/backends/media_foundation.h @@ -1,5 +1,3 @@ -# ifndef __TD__BASIC_MEDIA_PLAYER_H__ -# define __TD__BASIC_MEDIA_PLAYER_H__ # pragma once # include <mfapi.h> @@ -98,7 +96,7 @@ private: com_ptr<IMFSimpleAudioVolume> m_SimpleAudioVolume; com_ptr<IMFPresentationClock> m_PresentationClock; com_ptr<IMFAudioStreamVolume> m_StreamAudioVolume; - + optional<float> m_SetMasterVolume; mutable float m_MasterVolume; mutable float m_ReplayGain; @@ -110,6 +108,3 @@ private: State m_State; HANDLE m_CloseEvent; }; - - -# endif // __TD__BASIC_MEDIA_PLAYER_H__
\ No newline at end of file diff --git a/src/player/backends/utility/com_ptr.h b/src/player/backends/utility/com_ptr.h index 23534b2..519caef 100644 --- a/src/player/backends/utility/com_ptr.h +++ b/src/player/backends/utility/com_ptr.h @@ -1,5 +1,3 @@ -# ifndef __TD__COM_PTR_H__ -# define __TD__COM_PTR_H__ # pragma once template <typename T> @@ -144,5 +142,3 @@ template <typename T> inline bool operator<=(const com_ptr<T>& a, const com_ptr< template <typename T> inline bool operator>(const com_ptr<T>& a, const com_ptr<T>& b) { return std::greater<T*>()(a.get(), b.get()); } template <typename T> inline bool operator>=(const com_ptr<T>& a, const com_ptr<T>& b) { return std::greater_equal<T*>()(a.get(), b.get()); } template <typename T> void swap(com_ptr<T> & lhs, com_ptr<T> & rhs) { lhs.swap(rhs); } - -# endif // __TD__COM_PTR_H__
\ No newline at end of file diff --git a/src/player/backends/utility/optional.h b/src/player/backends/utility/optional.h index 9ee0b71..dcdc59a 100644 --- a/src/player/backends/utility/optional.h +++ b/src/player/backends/utility/optional.h @@ -1,8 +1,6 @@ //------------------------------------------------------------------------------ // //------------------------------------------------------------------------------ -# ifndef __TD__OPTIONAL_H__ -# define __TD__OPTIONAL_H__ # pragma once # include <type_traits> @@ -512,6 +510,3 @@ inline bool operator>=(const T& v, const optional<T>& opt) using namespace std; return static_cast<bool>(opt) ? greater_equal<T>(v, *opt) : true; } - - -# endif // __TD__OPTIONAL_H__ |