From 3ebc3e8722b6556757d4a0909480580de7ddf572 Mon Sep 17 00:00:00 2001 From: TangoCash Date: Fri, 6 Oct 2017 21:57:04 +0200 Subject: [PATCH] armbox: make open/close device public Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/6367dfc13fdc7dba1e7fed4aabec96f731acea40 Author: TangoCash Date: 2017-10-06 (Fri, 06 Oct 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/audio_lib.h | 6 +++--- libarmbox/video_lib.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libarmbox/audio_lib.h b/libarmbox/audio_lib.h index b2b78d6..8a71732 100644 --- a/libarmbox/audio_lib.h +++ b/libarmbox/audio_lib.h @@ -54,9 +54,6 @@ class cAudio int volume; - void openDevice(void); - void closeDevice(void); - int do_mute(bool enable, bool remember); void setBypassMode(bool disable); @@ -69,6 +66,9 @@ class cAudio cAudio(void *, void *, void *); ~cAudio(void); + void openDevice(void); + void closeDevice(void); + void *GetHandle() { return NULL; }; /* shut up */ int mute(bool remember = true) { return do_mute(true, remember); }; diff --git a/libarmbox/video_lib.h b/libarmbox/video_lib.h index 7c40cb1..9837571 100644 --- a/libarmbox/video_lib.h +++ b/libarmbox/video_lib.h @@ -158,14 +158,14 @@ class cVideo int64_t GetPTS(void); int brightness, contrast, saturation, hue; - - void openDevice(void); - void closeDevice(void); public: /* constructor & destructor */ cVideo(int mode, void *, void *, unsigned int unit = 0); ~cVideo(void); + void openDevice(void); + void closeDevice(void); + void * GetTVEnc() { return NULL; }; void * GetTVEncSD() { return NULL; };