Skip to content
Snippets Groups Projects
Commit d7274845 authored by Gregory Nutt's avatar Gregory Nutt
Browse files

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

parent 071f6cb4
No related branches found
No related tags found
No related merge requests found
...@@ -53,19 +53,6 @@ ...@@ -53,19 +53,6 @@
/**************************************************************************** /****************************************************************************
* Public Type Declarations * 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 */ /* This structure describes the internal state of the NxPlayer */
struct nxplayer_s struct nxplayer_s
...@@ -294,7 +281,7 @@ int nxplayer_resume(FAR struct nxplayer_s *pPlayer); ...@@ -294,7 +281,7 @@ int nxplayer_resume(FAR struct nxplayer_s *pPlayer);
#ifndef CONFIG_AUDIO_EXCLUDE_FFORWARD #ifndef CONFIG_AUDIO_EXCLUDE_FFORWARD
int nxplayer_fforward(FAR struct nxplayer_s *pPlayer, int nxplayer_fforward(FAR struct nxplayer_s *pPlayer,
enum nxplayer_subsample_e subsample); enum audio_subsample_e subsample);
#endif #endif
/**************************************************************************** /****************************************************************************
...@@ -319,7 +306,7 @@ int nxplayer_fforward(FAR struct nxplayer_s *pPlayer, ...@@ -319,7 +306,7 @@ int nxplayer_fforward(FAR struct nxplayer_s *pPlayer,
#ifndef CONFIG_AUDIO_EXCLUDE_REWIND #ifndef CONFIG_AUDIO_EXCLUDE_REWIND
int nxplayer_rewind(FAR struct nxplayer_s *pPlayer, int nxplayer_rewind(FAR struct nxplayer_s *pPlayer,
enum nxplayer_subsample_e subsample); enum audio_subsample_e subsample);
#endif #endif
/**************************************************************************** /****************************************************************************
......
...@@ -38,18 +38,19 @@ ...@@ -38,18 +38,19 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/audio/audio.h>
#include <debug.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/ioctl.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/ioctl.h>
#include <errno.h> #include <errno.h>
#include <dirent.h> #include <dirent.h>
#include <debug.h>
#include <nuttx/audio/audio.h>
#include <apps/nxplayer.h> #include <apps/nxplayer.h>
/**************************************************************************** /****************************************************************************
...@@ -1169,7 +1170,7 @@ int nxplayer_resume(FAR struct nxplayer_s *pPlayer) ...@@ -1169,7 +1170,7 @@ int nxplayer_resume(FAR struct nxplayer_s *pPlayer)
#ifndef CONFIG_AUDIO_EXCLUDE_FFORWARD #ifndef CONFIG_AUDIO_EXCLUDE_FFORWARD
int nxplayer_fforward(FAR struct nxplayer_s *pPlayer, int nxplayer_fforward(FAR struct nxplayer_s *pPlayer,
enum nxplayer_subsample_e subsample) enum audio_subsample_e subsample)
{ {
#warning Missing logic #warning Missing logic
return -ENOSYS; return -ENOSYS;
...@@ -1198,7 +1199,7 @@ int nxplayer_fforward(FAR struct nxplayer_s *pPlayer, ...@@ -1198,7 +1199,7 @@ int nxplayer_fforward(FAR struct nxplayer_s *pPlayer,
#ifndef CONFIG_AUDIO_EXCLUDE_REWIND #ifndef CONFIG_AUDIO_EXCLUDE_REWIND
int nxplayer_rewind(FAR struct nxplayer_s *pPlayer, int nxplayer_rewind(FAR struct nxplayer_s *pPlayer,
enum nxplayer_subsample_e subsample) enum audio_subsample_e subsample)
{ {
#warning Missing logic #warning Missing logic
return -ENOSYS; return -ENOSYS;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment