Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
0b9e9122
Commit
0b9e9122
authored
Aug 08, 2012
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
player_control: rename attribute "error" to "error_type"
parent
d35d2b26
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
12 deletions
+14
-12
player_control.c
src/player_control.c
+4
-4
player_control.h
src/player_control.h
+5
-3
player_thread.c
src/player_thread.c
+4
-4
playlist.c
src/playlist.c
+1
-1
No files found.
src/player_control.c
View file @
0b9e9122
...
...
@@ -47,7 +47,7 @@ pc_new(unsigned buffer_chunks, unsigned int buffered_before_play)
pc
->
cond
=
g_cond_new
();
pc
->
command
=
PLAYER_COMMAND_NONE
;
pc
->
error
=
PLAYER_ERROR_NONE
;
pc
->
error
_type
=
PLAYER_ERROR_NONE
;
pc
->
state
=
PLAYER_STATE_STOP
;
pc
->
cross_fade_seconds
=
0
;
pc
->
mixramp_db
=
0
;
...
...
@@ -80,7 +80,7 @@ void
pc_song_deleted
(
struct
player_control
*
pc
,
const
struct
song
*
song
)
{
if
(
pc
->
errored_song
==
song
)
{
pc
->
error
=
PLAYER_ERROR_NONE
;
pc
->
error
_type
=
PLAYER_ERROR_NONE
;
pc
->
errored_song
=
NULL
;
}
}
...
...
@@ -232,7 +232,7 @@ void
pc_clear_error
(
struct
player_control
*
pc
)
{
player_lock
(
pc
);
pc
->
error
=
PLAYER_ERROR_NONE
;
pc
->
error
_type
=
PLAYER_ERROR_NONE
;
pc
->
errored_song
=
NULL
;
player_unlock
(
pc
);
}
...
...
@@ -249,7 +249,7 @@ pc_get_error_message(struct player_control *pc)
char
*
error
;
char
*
uri
;
switch
(
pc
->
error
)
{
switch
(
pc
->
error
_type
)
{
case
PLAYER_ERROR_NONE
:
return
NULL
;
...
...
src/player_control.h
View file @
0b9e9122
...
...
@@ -108,7 +108,9 @@ struct player_control {
enum
player_command
command
;
enum
player_state
state
;
enum
player_error
error
;
enum
player_error
error_type
;
uint16_t
bit_rate
;
struct
audio_format
audio_format
;
float
total_time
;
...
...
@@ -236,9 +238,9 @@ char *
pc_get_error_message
(
struct
player_control
*
pc
);
static
inline
enum
player_error
pc_get_error
(
struct
player_control
*
pc
)
pc_get_error
_type
(
struct
player_control
*
pc
)
{
return
pc
->
error
;
return
pc
->
error
_type
;
}
void
...
...
src/player_thread.c
View file @
0b9e9122
...
...
@@ -238,7 +238,7 @@ player_wait_for_decoder(struct player *player)
if
(
decoder_lock_has_failed
(
dc
))
{
player_lock
(
pc
);
pc
->
errored_song
=
dc
->
song
;
pc
->
error
=
PLAYER_ERROR_DECODER
;
pc
->
error
_type
=
PLAYER_ERROR_DECODER
;
pc
->
next_song
=
NULL
;
player_unlock
(
pc
);
...
...
@@ -322,7 +322,7 @@ player_open_output(struct player *player)
player
->
paused
=
true
;
player_lock
(
pc
);
pc
->
error
=
PLAYER_ERROR_OUTPUT
;
pc
->
error
_type
=
PLAYER_ERROR_OUTPUT
;
pc
->
state
=
PLAYER_STATE_PAUSE
;
player_unlock
(
pc
);
...
...
@@ -353,7 +353,7 @@ player_check_decoder_startup(struct player *player)
player_lock
(
pc
);
pc
->
errored_song
=
dc
->
song
;
pc
->
error
=
PLAYER_ERROR_DECODER
;
pc
->
error
_type
=
PLAYER_ERROR_DECODER
;
player_unlock
(
pc
);
return
false
;
...
...
@@ -789,7 +789,7 @@ play_next_chunk(struct player *player)
player_lock
(
pc
);
pc
->
error
=
PLAYER_ERROR_OUTPUT
;
pc
->
error
_type
=
PLAYER_ERROR_OUTPUT
;
/* pause: the user may resume playback as soon as an
audio output becomes available */
...
...
src/playlist.c
View file @
0b9e9122
...
...
@@ -258,7 +258,7 @@ playlist_resume_playback(struct playlist *playlist, struct player_control *pc)
assert
(
playlist
->
playing
);
assert
(
pc_get_state
(
pc
)
==
PLAYER_STATE_STOP
);
error
=
pc_get_error
(
pc
);
error
=
pc_get_error
_type
(
pc
);
if
(
error
==
PLAYER_ERROR_NONE
)
playlist
->
error_count
=
0
;
else
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment