summaryrefslogtreecommitdiff
path: root/src/player/backends
diff options
context:
space:
mode:
authorMichał Cichoń <michcic@gmail.com>2017-05-18 18:25:59 +0200
committerMichał Cichoń <michcic@gmail.com>2017-05-18 18:25:59 +0200
commitcd5c65097ecf03480f477e47e0bb706dbf705a21 (patch)
tree21f4419d9dceae3226286585b8b5ca87ea1934ce /src/player/backends
parent6dee813dad2dd0b741025be046dfe3c7019bddb9 (diff)
parent593b2d6f18eb21309b82f7cad4a56f7bb1218180 (diff)
downloadpianobar-windows-cd5c65097ecf03480f477e47e0bb706dbf705a21.tar.gz
pianobar-windows-cd5c65097ecf03480f477e47e0bb706dbf705a21.tar.bz2
pianobar-windows-cd5c65097ecf03480f477e47e0bb706dbf705a21.zip
Merge branch 'release/2017.05.18'2017.05.18
Diffstat (limited to 'src/player/backends')
-rw-r--r--src/player/backends/media_foundation.h7
-rw-r--r--src/player/backends/utility/com_ptr.h4
-rw-r--r--src/player/backends/utility/optional.h5
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__