diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-07-23 18:21:08 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-07-23 18:21:08 -0600 |
| commit | eebd8e476193bc5cc7adf88eb5c3f3235d73dee5 (patch) | |
| tree | c12ad564c72afa288669b6d202aff096606e91ce /apps/include | |
| parent | 90fb19dcd1f6df2dd54b6502d0a9dd75abaa5ea2 (diff) | |
| download | nuttx-eebd8e476193bc5cc7adf88eb5c3f3235d73dee5.tar.gz nuttx-eebd8e476193bc5cc7adf88eb5c3f3235d73dee5.tar.bz2 nuttx-eebd8e476193bc5cc7adf88eb5c3f3235d73dee5.zip | |
NxPlayer: Misc changes to better integrate with NxWM::CMediaPlayer
Diffstat (limited to 'apps/include')
| -rw-r--r-- | apps/include/nsh.h | 4 | ||||
| -rw-r--r-- | apps/include/nxplayer.h | 25 |
2 files changed, 23 insertions, 6 deletions
diff --git a/apps/include/nsh.h b/apps/include/nsh.h index e16c85924..1a25d08ed 100644 --- a/apps/include/nsh.h +++ b/apps/include/nsh.h @@ -97,7 +97,7 @@ extern "C" * Name: nsh_initialize * * Description: - * This nterfaces is used to initialize the NuttShell (NSH). + * This interface is used to initialize the NuttShell (NSH). * nsh_initialize() should be called one during application start-up prior * to executing either nsh_consolemain() or nsh_telnetstart(). * @@ -132,7 +132,7 @@ void nsh_initialize(void); * Returned Values: * This function does not normally return. exit() is usually called to * terminate the NSH session. This function will return in the event of - * an error. In that case, a nonzero value is returned (EXIT_FAILURE=1). + * an error. In that case, a non-zero value is returned (EXIT_FAILURE=1). * ****************************************************************************/ diff --git a/apps/include/nxplayer.h b/apps/include/nxplayer.h index 13f70c381..cd0517dcf 100644 --- a/apps/include/nxplayer.h +++ b/apps/include/nxplayer.h @@ -90,6 +90,18 @@ typedef int (*nxplayer_func)(FAR struct nxplayer_s* pPlayer, char* pargs); ****************************************************************************/ /**************************************************************************** + * Public Data + ****************************************************************************/ + +#ifdef __cplusplus +#define EXTERN extern "C" +extern "C" +{ +#else +#define EXTERN extern +#endif + +/**************************************************************************** * Public Function Prototypes ****************************************************************************/ @@ -165,7 +177,7 @@ void nxplayer_reference(FAR struct nxplayer_s *pPlayer); * **************************************************************************/ -int nxplayer_setdevice(FAR struct nxplayer_s *pPlayer, char* device); +int nxplayer_setdevice(FAR struct nxplayer_s *pPlayer, FAR const char *device); /**************************************************************************** * Name: nxplayer_playfile @@ -188,8 +200,8 @@ int nxplayer_setdevice(FAR struct nxplayer_s *pPlayer, char* device); * **************************************************************************/ -int nxplayer_playfile(FAR struct nxplayer_s *pPlayer, char* filename, - int filefmt, int subfmt); +int nxplayer_playfile(FAR struct nxplayer_s *pPlayer, FAR char *filename, + int filefmt, int subfmt); /**************************************************************************** * Name: nxplayer_stop @@ -296,7 +308,7 @@ int nxplayer_setbalance(FAR struct nxplayer_s *pPlayer, uint16_t balance); * **************************************************************************/ -inline void nxplayer_setmediadir(FAR struct nxplayer_s *pPlayer, char* mediadir); +void nxplayer_setmediadir(FAR struct nxplayer_s *pPlayer, FAR char *mediadir); /**************************************************************************** * Name: nxplayer_setbass @@ -354,4 +366,9 @@ int nxplayer_settreble(FAR struct nxplayer_s *pPlayer, uint8_t treble); int nxplayer_systemreset(FAR struct nxplayer_s *pPlayer); #endif +#undef EXTERN +#ifdef __cplusplus +} +#endif + #endif /* __APPS_SYSTEM_NXPLAYER_NXPLAYER_H */ |