sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move subsampling rate definitions from nxplayer.h to audio.h

Browse Source
This commit is contained in:
Gregory Nutt 2014-07-27 11:05:25 -06:00
parent 071f6cb424
commit d7274845a4
2 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/nxplayer.h
View File

@ -53,19 +53,6 @@
/****************************************************************************
* Public Type Declarations
****************************************************************************/
/* Fast-forward and rewind by sub-sampling may be supported. If so, then
* this enumeration specifies the sub-sampling:
*/
enum nxplayer_subsample_e
{
SUBSAMPLE_1X = 0, /* Normal speed (no direction change) */
SUBSAMPLE_2X,
SUBSAMPLE_4X,
SUBSAMPLE_8X,
SUBSAMPLE_16X
};
/* This structure describes the internal state of the NxPlayer */
struct nxplayer_s
@ -294,7 +281,7 @@ int nxplayer_resume(FAR struct nxplayer_s *pPlayer);
#ifndef CONFIG_AUDIO_EXCLUDE_FFORWARD
int nxplayer_fforward(FAR struct nxplayer_s *pPlayer,
enum nxplayer_subsample_e subsample);
enum audio_subsample_e subsample);
#endif
/****************************************************************************
@ -319,7 +306,7 @@ int nxplayer_fforward(FAR struct nxplayer_s *pPlayer,
#ifndef CONFIG_AUDIO_EXCLUDE_REWIND
int nxplayer_rewind(FAR struct nxplayer_s *pPlayer,
enum nxplayer_subsample_e subsample);
enum audio_subsample_e subsample);
#endif
/****************************************************************************

11
system/nxplayer/nxplayer.c
View File

@ -38,18 +38,19 @@
****************************************************************************/
#include <nuttx/config.h>
#include <nuttx/audio/audio.h>
#include <debug.h>
#include <sys/types.h>
#include <sys/ioctl.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#include <errno.h>
#include <dirent.h>
#include <debug.h>
#include <nuttx/audio/audio.h>
#include <apps/nxplayer.h>
/****************************************************************************
@ -1169,7 +1170,7 @@ int nxplayer_resume(FAR struct nxplayer_s *pPlayer)
#ifndef CONFIG_AUDIO_EXCLUDE_FFORWARD
int nxplayer_fforward(FAR struct nxplayer_s *pPlayer,
enum nxplayer_subsample_e subsample)
enum audio_subsample_e subsample)
{
#warning Missing logic
return -ENOSYS;
@ -1198,7 +1199,7 @@ int nxplayer_fforward(FAR struct nxplayer_s *pPlayer,
#ifndef CONFIG_AUDIO_EXCLUDE_REWIND
int nxplayer_rewind(FAR struct nxplayer_s *pPlayer,
enum nxplayer_subsample_e subsample)
enum audio_subsample_e subsample)
{
#warning Missing logic
return -ENOSYS;