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
19acf090
Commit
19acf090
authored
Dec 22, 2010
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
input/cdda: remove newlines from error messages
parent
2de7f6b4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
8 deletions
+10
-8
cdda_input_plugin.c
src/input/cdda_input_plugin.c
+10
-8
No files found.
src/input/cdda_input_plugin.c
View file @
19acf090
...
...
@@ -111,7 +111,7 @@ input_cdda_open(const char *uri, GError **error_r)
cd_drives
=
cdio_get_devices_with_cap
(
NULL
,
CDIO_FS_AUDIO
,
false
);
if
(
!
cd_drives
)
{
g_set_error
(
error_r
,
cdda_quark
(),
0
,
"Unable find or access a CD-ROM drive with an audio CD in it.
\n
"
);
"Unable find or access a CD-ROM drive with an audio CD in it."
);
input_cdda_close
(
i
);
return
NULL
;
}
...
...
@@ -124,7 +124,8 @@ input_cdda_open(const char *uri, GError **error_r)
cdio_free_device_list
(
cd_drives
);
if
(
!
i
->
drv
)
{
g_set_error
(
error_r
,
cdda_quark
(),
0
,
"Unable to identify audio CD disc.
\n
"
);
g_set_error
(
error_r
,
cdda_quark
(),
0
,
"Unable to identify audio CD disc."
);
input_cdda_close
(
i
);
return
NULL
;
}
...
...
@@ -132,7 +133,7 @@ input_cdda_open(const char *uri, GError **error_r)
cdda_verbose_set
(
i
->
drv
,
CDDA_MESSAGE_FORGETIT
,
CDDA_MESSAGE_FORGETIT
);
if
(
0
!=
cdio_cddap_open
(
i
->
drv
)
)
{
g_set_error
(
error_r
,
cdda_quark
(),
0
,
"Unable to open disc.
\n
"
);
g_set_error
(
error_r
,
cdda_quark
(),
0
,
"Unable to open disc."
);
input_cdda_close
(
i
);
return
NULL
;
}
...
...
@@ -140,17 +141,18 @@ input_cdda_open(const char *uri, GError **error_r)
i
->
endian
=
data_bigendianp
(
i
->
drv
);
switch
(
i
->
endian
)
{
case
-
1
:
g_debug
(
"cdda: drive returns unknown audio data, assuming Little Endian
\n
"
);
g_debug
(
"cdda: drive returns unknown audio data, assuming Little Endian"
);
i
->
endian
=
0
;
break
;
case
0
:
g_debug
(
"cdda: drive returns audio data Little Endian."
);
break
;
case
1
:
g_debug
(
"cdda: drive returns audio data Big Endian.
\n
"
);
g_debug
(
"cdda: drive returns audio data Big Endian."
);
break
;
default:
g_set_error
(
error_r
,
cdda_quark
(),
0
,
"Drive returns unknown data type %d.
\n
"
,
i
->
endian
);
g_set_error
(
error_r
,
cdda_quark
(),
0
,
"Drive returns unknown data type %d"
,
i
->
endian
);
input_cdda_close
(
i
)
return
NULL
;
}
...
...
@@ -272,7 +274,7 @@ input_cdda_read(struct input_stream *is, void *ptr, size_t length,
s_err
=
cdda_errors
(
cis
->
drv
);
if
(
s_err
)
{
g_warning
(
"paranoia_read: %s
\n
"
,
s_err
);
g_warning
(
"paranoia_read: %s"
,
s_err
);
free
(
s_err
);
}
s_mess
=
cdda_messages
(
cis
->
drv
);
...
...
@@ -281,7 +283,7 @@ input_cdda_read(struct input_stream *is, void *ptr, size_t length,
}
if
(
!
rbuf
)
{
g_set_error
(
error_r
,
cdda_quark
(),
0
,
"paranoia read error. Stopping.
\n
"
);
"paranoia read error. Stopping."
);
return
0
;
}
//do the swapping if nessesary
...
...
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