- libarmbox: some manual code nicenings

Signed-off-by: Thilo Graf <dbt@novatux.de>

libarmbox/audio_lib.h

@@ -57,40 +57,22 @@ class cAudio
 
 		void setAVInput(int val);
 
-		void *GetHandle()
-		{
-			return NULL;
-		};
+		void *GetHandle() { return NULL; };
 		/* shut up */
-		int mute(bool remember = true)
-		{
-			return do_mute(true, remember);
-		};
-		int unmute(bool remember = true)
-		{
-			return do_mute(false, remember);
-		};
+		int mute(bool remember = true) { return do_mute(true, remember); };
+		int unmute(bool remember = true) { return do_mute(false, remember); };
 
 		/* volume, min = 0, max = 255 */
 		int setVolume(unsigned int left, unsigned int right);
-		int getVolume(void)
-		{
-			return volume;
-		}
-		bool getMuteStatus(void)
-		{
-			return Muted;
-		};
+		int getVolume(void) { return volume; }
+		bool getMuteStatus(void) { return Muted; };
 
 		/* start and stop audio */
 		int Start(void);
 		int Stop(void);
 		bool Pause(bool Pcm = true);
 		void SetStreamType(int bypass);
-		int GetStreamType(void)
-		{
-			return StreamType;
-		}
+		int GetStreamType(void) { return StreamType; }
 		void SetSyncMode(AVSYNC_TYPE Mode);
 
 		/* select channels */
@@ -100,10 +82,7 @@ class cAudio
 		int StopClip();
 		void getAudioInfo(int &type, int &layer, int &freq, int &bitrate, int &mode);
 		void SetSRS(int iq_enable, int nmgr_enable, int iq_mode, int iq_level);
-		bool IsHdmiDDSupported()
-		{
-			return true;
-		};
+		bool IsHdmiDDSupported() { return true; };
 		void SetHdmiDD(bool enable);
 		void SetSpdifDD(bool enable);
 		void ScheduleMute(bool On);

libarmbox/hdmi_cec.h

@@ -96,18 +96,9 @@ class hdmi_cec : public OpenThreads::Thread
 		void vol_up();
 		void vol_down();
 		void toggle_mute();
-		int GetVolume()
-		{
-			return volume;
-		};
-		bool isMuted()
-		{
-			return muted;
-		};
-		int GetAudioDestination()
-		{
-			return (int)audio_destination;
-		}
+		int GetVolume() { return volume; };
+		bool isMuted() { return muted; };
+		int GetAudioDestination() { return (int)audio_destination; }
 		void SetAudioDestination(int audio_dest);
 };
 

libarmbox/hisilicon.h

@@ -103,7 +103,7 @@ typedef enum hiFORMAT_AUDIO_TYPE_E
 
 	HI_FORMAT_AUDIO_ADPCM = 0x130, /**< various ADPCM codecs. */
 
-	HI_FORMAT_AUDIO_AMR_NB = 0x160,/**< various AMR codecs. */
+	HI_FORMAT_AUDIO_AMR_NB = 0x160, /**< various AMR codecs. */
 	HI_FORMAT_AUDIO_AMR_WB,
 	HI_FORMAT_AUDIO_AMR_AWB,
 

libarmbox/linux-uapi-cec.h

@@ -515,7 +515,6 @@ struct cec_event
 #define CEC_MSG_IMAGE_VIEW_ON				0x04
 #define CEC_MSG_TEXT_VIEW_ON				0x0d
 
-
 /* Routing Control Feature */
 
 /*
@@ -529,11 +528,9 @@ struct cec_event
 #define CEC_MSG_ROUTING_INFORMATION			0x81
 #define CEC_MSG_SET_STREAM_PATH				0x86
 
-
 /* Standby Feature */
 #define CEC_MSG_STANDBY					0x36
 
-
 /* One Touch Record Feature */
 #define CEC_MSG_RECORD_OFF				0x0b
 #define CEC_MSG_RECORD_ON				0x09
@@ -608,7 +605,6 @@ struct cec_event
 
 #define CEC_MSG_RECORD_TV_SCREEN			0x0f
 
-
 /* Timer Programming Feature */
 #define CEC_MSG_CLEAR_ANALOGUE_TIMER			0x33
 /* Recording Sequence Operand (recording_seq) */
@@ -669,7 +665,6 @@ struct cec_event
 #define CEC_OP_PROG_ERROR_CLOCK_FAILURE			0x0a
 #define CEC_OP_PROG_ERROR_DUPLICATE			0x0e
 
-
 /* System Information Feature */
 #define CEC_MSG_CEC_VERSION				0x9e
 /* CEC Version Operand (cec_version) */
@@ -727,7 +722,6 @@ struct cec_event
 
 #define CEC_MSG_GIVE_FEATURES				0xa5	/* HDMI 2.0 */
 
-
 /* Deck Control Feature */
 #define CEC_MSG_DECK_CONTROL				0x42
 /* Deck Control Mode Operand (deck_control_mode) */
@@ -778,7 +772,6 @@ struct cec_event
 #define CEC_OP_PLAY_MODE_PLAY_SLOW_REV_MED		0x1a
 #define CEC_OP_PLAY_MODE_PLAY_SLOW_REV_MAX		0x1b
 
-
 /* Tuner Control Feature */
 #define CEC_MSG_GIVE_TUNER_DEVICE_STATUS		0x08
 #define CEC_MSG_SELECT_ANALOGUE_SERVICE			0x92
@@ -795,7 +788,6 @@ struct cec_event
 #define CEC_MSG_TUNER_STEP_DECREMENT			0x06
 #define CEC_MSG_TUNER_STEP_INCREMENT			0x05
 
-
 /* Vendor Specific Commands Feature */
 
 /*
@@ -810,7 +802,6 @@ struct cec_event
 #define CEC_MSG_VENDOR_REMOTE_BUTTON_DOWN		0x8a
 #define CEC_MSG_VENDOR_REMOTE_BUTTON_UP			0x8b
 
-
 /* OSD Display Feature */
 #define CEC_MSG_SET_OSD_STRING				0x64
 /* Display Control Operand (disp_ctl) */
@@ -818,12 +809,10 @@ struct cec_event
 #define CEC_OP_DISP_CTL_UNTIL_CLEARED			0x40
 #define CEC_OP_DISP_CTL_CLEAR				0x80
 
-
 /* Device OSD Transfer Feature */
 #define CEC_MSG_GIVE_OSD_NAME				0x46
 #define CEC_MSG_SET_OSD_NAME				0x47
 
-
 /* Device Menu Control Feature */
 #define CEC_MSG_MENU_REQUEST				0x8d
 /* Menu Request Type Operand (menu_req) */
@@ -866,7 +855,6 @@ struct cec_event
 
 #define CEC_MSG_USER_CONTROL_RELEASED			0x45
 
-
 /* Remote Control Passthrough Feature */
 
 /*
@@ -875,7 +863,6 @@ struct cec_event
  *	CEC_MSG_USER_CONTROL_RELEASED
  */
 
-
 /* Power Status Feature */
 #define CEC_MSG_GIVE_DEVICE_POWER_STATUS		0x8f
 #define CEC_MSG_REPORT_POWER_STATUS			0x90
@@ -885,7 +872,6 @@ struct cec_event
 #define CEC_OP_POWER_STATUS_TO_ON			2
 #define CEC_OP_POWER_STATUS_TO_STANDBY			3
 
-
 /* General Protocol Messages */
 #define CEC_MSG_FEATURE_ABORT				0x00
 /* Abort Reason Operand (reason) */
@@ -898,7 +884,6 @@ struct cec_event
 
 #define CEC_MSG_ABORT					0xff
 
-
 /* System Audio Control Feature */
 
 /*
@@ -926,7 +911,6 @@ struct cec_event
 #define CEC_OP_AUD_FMT_ID_CEA861			0
 #define CEC_OP_AUD_FMT_ID_CEA861_CXT			1
 
-
 /* Audio Rate Control Feature */
 #define CEC_MSG_SET_AUDIO_RATE				0x9a
 /* Audio Rate Operand (audio_rate) */
@@ -938,7 +922,6 @@ struct cec_event
 #define CEC_OP_AUD_RATE_NARROW_FAST			5
 #define CEC_OP_AUD_RATE_NARROW_SLOW			6
 
-
 /* Audio Return Channel Control Feature */
 #define CEC_MSG_INITIATE_ARC				0xc0
 #define CEC_MSG_REPORT_ARC_INITIATED			0xc1
@@ -947,7 +930,6 @@ struct cec_event
 #define CEC_MSG_REQUEST_ARC_TERMINATION			0xc4
 #define CEC_MSG_TERMINATE_ARC				0xc5
 
-
 /* Dynamic Audio Lipsync Feature */
 /* Only for CEC 2.0 and up */
 #define CEC_MSG_REQUEST_CURRENT_LATENCY			0xa7
@@ -961,7 +943,6 @@ struct cec_event
 #define CEC_OP_AUD_OUT_COMPENSATED_NO_DELAY		2
 #define CEC_OP_AUD_OUT_COMPENSATED_PARTIAL_DELAY	3
 
-
 /* Capability Discovery and Control Feature */
 #define CEC_MSG_CDC_MESSAGE				0xf8
 /* Ethernet-over-HDMI: nobody ever does this... */

libarmbox/playback_gst.h

@@ -81,15 +81,9 @@ class cPlayback
 		int GetSubtitlePid(void);
 		bool SetPosition(int position, bool absolute = false);
 		void FindAllPids(int *apids, unsigned int *ac3flags, unsigned int *numpida, std::string *language);
-		void FindAllPids(uint16_t *apids, unsigned short *ac3flags, uint16_t *numpida, std::string *language)
-		{
-			FindAllPids((int *) apids, (unsigned int *) ac3flags, (unsigned int *) numpida, language);
-		};
+		void FindAllPids(uint16_t *apids, unsigned short *ac3flags, uint16_t *numpida, std::string *language) { FindAllPids((int *) apids, (unsigned int *) ac3flags, (unsigned int *) numpida, language); };
 		void FindAllSubs(int *pids, unsigned int *supported, unsigned int *numpida, std::string *language);
-		void FindAllSubs(uint16_t *pids, unsigned short *supported, uint16_t *numpida, std::string *language)
-		{
-			FindAllSubs((int *) pids, (unsigned int *) supported, (unsigned int *) numpida, language);
-		};
+		void FindAllSubs(uint16_t *pids, unsigned short *supported, uint16_t *numpida, std::string *language) { FindAllSubs((int *) pids, (unsigned int *) supported, (unsigned int *) numpida, language); };
 		bool SelectSubtitles(int pid, std::string charset = "");
 		void FindAllSubtitlePids(int *pids, unsigned int *numpids, std::string *language);
 		void FindAllTeletextsubtitlePids(int *pids, unsigned int *numpidt, std::string *tlanguage, int *mags, int *pages);

libarmbox/playback_hisilicon.h

@@ -83,18 +83,9 @@ class cPlayback
 		bool SetVPid(int /*pid*/);
 		bool SetSubtitlePid(int pid);
 		bool SetTeletextPid(int pid);
-		int GetAPid(void)
-		{
-			return mAudioStream;
-		}
-		int GetVPid(void)
-		{
-			return 0;
-		}
-		int GetSubtitlePid(void)
-		{
-			return mSubtitleStream;
-		}
+		int GetAPid(void) { return mAudioStream; }
+		int GetVPid(void) { return 0; }
+		int GetSubtitlePid(void) { return mSubtitleStream; }
 		int GetTeletextPid(void);
 		bool SetSpeed(int speed);
 		bool GetSpeed(int &speed) const;
@@ -133,7 +124,9 @@ class netlink_event : public OpenThreads::Thread
 		int m_player_state;
 		enum
 		{
-			stIdle, stRunning, stStopped,
+			stIdle,
+			stRunning,
+			stStopped,
 		};
 		struct streamid
 		{
@@ -157,10 +150,7 @@ class netlink_event : public OpenThreads::Thread
 		void Receive();
 	public:
 		static netlink_event *getInstance();
-		uint64_t getDuration()
-		{
-			return fileinfo.s64Duration;
-		};
+		uint64_t getDuration() { return fileinfo.s64Duration; };
 		bool Start(cPlayback *player);
 		bool Stop();
 };

libarmbox/playback_libeplayer3.h

@@ -48,18 +48,9 @@ class cPlayback
 		bool SetVPid(int /*pid*/);
 		bool SetSubtitlePid(int pid);
 		bool SetTeletextPid(int pid);
-		int GetAPid(void)
-		{
-			return mAudioStream;
-		}
-		int GetVPid(void)
-		{
-			return 0;
-		}
-		int GetSubtitlePid(void)
-		{
-			return mSubtitleStream;
-		}
+		int GetAPid(void) { return mAudioStream; }
+		int GetVPid(void) { return 0; }
+		int GetSubtitlePid(void) { return mSubtitleStream; }
 		int GetTeletextPid(void);
 		bool SetSpeed(int speed);
 		bool GetSpeed(int &speed) const;

libarmbox/record_lib.h

@@ -40,11 +40,7 @@ class cRecord
 		size_t io_len[RECORD_WRITER_CHUNKS];
 	public:
 		cRecord(int num = 0, int bs_dmx = 2048 * 1024, int bs = 4096 * 1024);
-		void setFailureCallback(void (*f)(void *), void *d)
-		{
-			failureCallback = f;
-			failureData = d;
-		}
+		void setFailureCallback(void (*f)(void *), void *d) { failureCallback = f; failureData = d; }
 		~cRecord();
 
 		bool Open();

libarmbox/video_lib.h

@@ -222,14 +222,8 @@ class cVideo
 
 		void setAVInput(int val);
 
-		void *GetTVEnc()
-		{
-			return NULL;
-		};
-		void *GetTVEncSD()
-		{
-			return NULL;
-		};
+		void *GetTVEnc() { return NULL; };
+		void *GetTVEncSD() { return NULL; };
 
 		/* aspect ratio */
 		int getAspectRatio(void);
@@ -274,34 +268,13 @@ class cVideo
 		void setContrast(int val);
 		void SetVideoMode(analog_mode_t mode);
 		void QuadPiP(bool active = false, int _x = 0, int _y = 0, int _w = 360, int _h = 288);
-		void SetDBDR(int)
-		{
-			return;
-		};
-		void SetAudioHandle(void *)
-		{
-			return;
-		};
-		void SetAutoModes(int [VIDEO_STD_MAX])
-		{
-			return;
-		};
-		int  OpenVBI(int)
-		{
-			return 0;
-		};
-		int  CloseVBI(void)
-		{
-			return 0;
-		};
-		int  StartVBI(unsigned short)
-		{
-			return 0;
-		};
-		int  StopVBI(void)
-		{
-			return 0;
-		};
+		void SetDBDR(int) { return; };
+		void SetAudioHandle(void *) { return; };
+		void SetAutoModes(int [VIDEO_STD_MAX]) { return; };
+		int OpenVBI(int) { return 0; };
+		int CloseVBI(void) { return 0; };
+		int StartVBI(unsigned short) { return 0; };
+		int StopVBI(void) { return 0; };
 		void SetDemux(cDemux *dmx);
 		void SetColorFormat(COLOR_FORMAT color_format);
 		bool GetScreenImage(unsigned char *&data, int &xres, int &yres, bool get_video = true, bool get_osd = false, bool scale_to_video = false);