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
a2faaa1f
Commit
a2faaa1f
authored
10 years ago
by
Gregory Nutt
Browse files
Options
Downloads
Patches
Plain Diff
NxPlayer: Misc changes to better integrate with NxWM::CMediaPlayer
parent
b3740469
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
include/nsh.h
+2
-2
2 additions, 2 deletions
include/nsh.h
include/nxplayer.h
+21
-4
21 additions, 4 deletions
include/nxplayer.h
system/nxplayer/nxplayer.c
+1
-1
1 addition, 1 deletion
system/nxplayer/nxplayer.c
with
24 additions
and
7 deletions
include/nsh.h
+
2
−
2
View file @
a2faaa1f
...
...
@@ -97,7 +97,7 @@ extern "C"
* Name: nsh_initialize
*
* Description:
* This nterface
s
is used to initialize the NuttShell (NSH).
* This
i
nterface 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).
*
****************************************************************************/
...
...
This diff is collapsed.
Click to expand it.
include/nxplayer.h
+
21
−
4
View file @
a2faaa1f
...
...
@@ -89,6 +89,18 @@ typedef int (*nxplayer_func)(FAR struct nxplayer_s* pPlayer, char* pargs);
* Public Data
****************************************************************************/
/****************************************************************************
* 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 */
This diff is collapsed.
Click to expand it.
system/nxplayer/nxplayer.c
+
1
−
1
View file @
a2faaa1f
...
...
@@ -1120,7 +1120,7 @@ int nxplayer_resume(FAR struct nxplayer_s *pPlayer)
****************************************************************************/
#ifdef CONFIG_NXPLAYER_INCLUDE_PREFERRED_DEVICE
int
nxplayer_setdevice
(
FAR
struct
nxplayer_s
*
pPlayer
,
char
*
pDevice
)
int
nxplayer_setdevice
(
FAR
struct
nxplayer_s
*
pPlayer
,
FAR
const
char
*
pDevice
)
{
int
tempFd
;
struct
audio_caps_s
caps
;
...
...
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