oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

java/GlobalRef: remove method Set(), always require initialization

Browse Source
This commit is contained in:
Max Kellermann 2021-07-23 18:19:53 +02:00 committed by Max Kellermann
parent 917fe549b0
commit 31f7fede30
2 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/android/AudioManager.hxx
View File

@ -30,10 +30,6 @@ class AudioManager : public Java::GlobalObject {
public: public:
AudioManager(JNIEnv *env, jobject obj) noexcept; AudioManager(JNIEnv *env, jobject obj) noexcept;
AudioManager(std::nullptr_t) noexcept { maxVolume = 0; }
~AudioManager() noexcept {}
int GetMaxVolume() { return maxVolume; } int GetMaxVolume() { return maxVolume; }
int GetVolume(JNIEnv *env); int GetVolume(JNIEnv *env);
void SetVolume(JNIEnv *env, int); void SetVolume(JNIEnv *env, int);

17
src/java/Ref.hxx
View File

@ -110,12 +110,6 @@ class GlobalRef {
T value; T value;
public: public:
/**
* Constructs an uninitialized object. The method
* set() must be called before it is destructed.
*/
GlobalRef() = default;
GlobalRef(JNIEnv *env, T _value) noexcept GlobalRef(JNIEnv *env, T _value) noexcept
:value(_value) :value(_value)
{ {
@ -135,17 +129,6 @@ public:
GlobalRef(const GlobalRef &other) = delete; GlobalRef(const GlobalRef &other) = delete;
GlobalRef &operator=(const GlobalRef &other) = delete; GlobalRef &operator=(const GlobalRef &other) = delete;
/**
* Sets the object, ignoring the previous value. This
* is only allowed once after the default constructor
* was used.
*/
void Set(JNIEnv *env, T _value) noexcept {
assert(_value != nullptr);
value = (T)env->NewGlobalRef(_value);
}
T Get() const noexcept { T Get() const noexcept {
return value; return value;
} }