Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
nuttx-apps
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
f4grx
nuttx-apps
Commits
d7274845
Commit
d7274845
authored
10 years ago
by
Gregory Nutt
Browse files
Options
Downloads
Patches
Plain Diff
Move subsampling rate definitions from nxplayer.h to audio.h
parent
071f6cb4
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/nxplayer.h
+2
-15
2 additions, 15 deletions
include/nxplayer.h
system/nxplayer/nxplayer.c
+6
-5
6 additions, 5 deletions
system/nxplayer/nxplayer.c
with
8 additions
and
20 deletions
include/nxplayer.h
+
2
−
15
View file @
d7274845
...
@@ -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
/****************************************************************************
/****************************************************************************
...
...
This diff is collapsed.
Click to expand it.
system/nxplayer/nxplayer.c
+
6
−
5
View file @
d7274845
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment