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
9c66b041
Commit
9c66b041
authored
Apr 02, 2020
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
test/*: fix Windows build using class FromNarrowPath
parent
4d453a83
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
30 additions
and
19 deletions
+30
-19
ContainerScan.cxx
test/ContainerScan.cxx
+2
-1
DumpDatabase.cxx
test/DumpDatabase.cxx
+2
-1
ReadApeTags.cxx
test/ReadApeTags.cxx
+2
-1
WriteFile.cxx
test/WriteFile.cxx
+2
-1
dump_playlist.cxx
test/dump_playlist.cxx
+2
-1
read_conf.cxx
test/read_conf.cxx
+2
-2
read_tags.cxx
test/read_tags.cxx
+5
-4
run_decoder.cxx
test/run_decoder.cxx
+4
-3
run_filter.cxx
test/run_filter.cxx
+2
-1
run_gunzip.cxx
test/run_gunzip.cxx
+2
-1
run_input.cxx
test/run_input.cxx
+3
-2
run_output.cxx
test/run_output.cxx
+2
-1
No files found.
test/ContainerScan.cxx
View file @
9c66b041
...
...
@@ -23,6 +23,7 @@
#include "decoder/DecoderList.hxx"
#include "decoder/DecoderPlugin.hxx"
#include "fs/Path.hxx"
#include "fs/NarrowPath.hxx"
#include "fs/io/StdioOutputStream.hxx"
#include "fs/io/BufferedOutputStream.hxx"
#include "util/UriUtil.hxx"
...
...
@@ -63,7 +64,7 @@ try {
return
EXIT_FAILURE
;
}
const
Path
path
=
Path
::
FromFS
(
argv
[
1
])
;
const
FromNarrowPath
path
=
argv
[
1
]
;
const
ScopeDecoderPluginsInit
decoder_plugins_init
({});
...
...
test/DumpDatabase.cxx
View file @
9c66b041
...
...
@@ -29,6 +29,7 @@
#include "ConfigGlue.hxx"
#include "tag/Config.hxx"
#include "fs/Path.hxx"
#include "fs/NarrowPath.hxx"
#include "event/Thread.hxx"
#include "util/ScopeExit.hxx"
#include "util/PrintException.hxx"
...
...
@@ -107,7 +108,7 @@ try {
return
1
;
}
const
Path
config_path
=
Path
::
FromFS
(
argv
[
1
])
;
const
FromNarrowPath
config_path
=
argv
[
1
]
;
const
char
*
const
plugin_name
=
argv
[
2
];
const
DatabasePlugin
*
plugin
=
GetDatabasePluginByName
(
plugin_name
);
...
...
test/ReadApeTags.cxx
View file @
9c66b041
...
...
@@ -21,6 +21,7 @@
#include "tag/ApeLoader.hxx"
#include "thread/Mutex.hxx"
#include "fs/Path.hxx"
#include "fs/NarrowPath.hxx"
#include "input/InputStream.hxx"
#include "input/LocalOpen.hxx"
#include "util/StringView.hxx"
...
...
@@ -58,7 +59,7 @@ try {
return
EXIT_FAILURE
;
}
const
Path
path
=
Path
::
FromFS
(
argv
[
1
])
;
const
FromNarrowPath
path
=
argv
[
1
]
;
Mutex
mutex
;
...
...
test/WriteFile.cxx
View file @
9c66b041
...
...
@@ -18,6 +18,7 @@
*/
#include "fs/io/FileOutputStream.hxx"
#include "fs/NarrowPath.hxx"
#include "util/PrintException.hxx"
#include <unistd.h>
...
...
@@ -54,7 +55,7 @@ try {
return
EXIT_FAILURE
;
}
const
Path
path
=
Path
::
FromFS
(
argv
[
1
])
;
const
FromNarrowPath
path
=
argv
[
1
]
;
FileOutputStream
fos
(
path
);
...
...
test/dump_playlist.cxx
View file @
9c66b041
...
...
@@ -28,6 +28,7 @@
#include "playlist/PlaylistRegistry.hxx"
#include "playlist/PlaylistPlugin.hxx"
#include "fs/Path.hxx"
#include "fs/NarrowPath.hxx"
#include "fs/io/BufferedOutputStream.hxx"
#include "fs/io/StdioOutputStream.hxx"
#include "thread/Cond.hxx"
...
...
@@ -54,7 +55,7 @@ try {
return
EXIT_FAILURE
;
}
const
Path
config_path
=
Path
::
FromFS
(
argv
[
1
])
;
const
FromNarrowPath
config_path
=
argv
[
1
]
;
uri
=
argv
[
2
];
/* initialize MPD */
...
...
test/read_conf.cxx
View file @
9c66b041
...
...
@@ -21,7 +21,7 @@
#include "config/Param.hxx"
#include "config/File.hxx"
#include "fs/Path.hxx"
#include "fs/Path.hxx"
#include "fs/
Narrow
Path.hxx"
#include "util/PrintException.hxx"
#include "util/RuntimeError.hxx"
...
...
@@ -36,7 +36,7 @@ try {
return
EXIT_FAILURE
;
}
const
Path
config_path
=
Path
::
FromFS
(
argv
[
1
])
;
const
FromNarrowPath
config_path
=
argv
[
1
]
;
const
char
*
name
=
argv
[
2
];
const
auto
option
=
ParseConfigOptionName
(
name
);
...
...
test/read_tags.cxx
View file @
9c66b041
...
...
@@ -27,6 +27,7 @@
#include "tag/Handler.hxx"
#include "tag/Generic.hxx"
#include "fs/Path.hxx"
#include "fs/NarrowPath.hxx"
#include "AudioFormat.hxx"
#include "util/ScopeExit.hxx"
#include "util/StringBuffer.hxx"
...
...
@@ -88,7 +89,7 @@ try {
}
decoder_name
=
argv
[
1
];
const
Path
path
=
Path
::
FromFS
(
argv
[
2
])
;
const
char
*
path
=
argv
[
2
]
;
EventThread
io_thread
;
io_thread
.
Start
();
...
...
@@ -107,7 +108,7 @@ try {
DumpTagHandler
h
;
bool
success
;
try
{
success
=
plugin
->
ScanFile
(
path
,
h
);
success
=
plugin
->
ScanFile
(
FromNarrowPath
(
path
)
,
h
);
}
catch
(...)
{
PrintException
(
std
::
current_exception
());
success
=
false
;
...
...
@@ -117,7 +118,7 @@ try {
InputStreamPtr
is
;
if
(
!
success
&&
plugin
->
scan_stream
!=
NULL
)
{
is
=
InputStream
::
OpenReady
(
path
.
c_str
()
,
mutex
);
is
=
InputStream
::
OpenReady
(
path
,
mutex
);
success
=
plugin
->
ScanStream
(
*
is
,
h
);
}
...
...
@@ -130,7 +131,7 @@ try {
if
(
is
)
ScanGenericTags
(
*
is
,
h
);
else
ScanGenericTags
(
path
,
h
);
ScanGenericTags
(
FromNarrowPath
(
path
)
,
h
);
}
return
0
;
...
...
test/run_decoder.cxx
View file @
9c66b041
...
...
@@ -26,6 +26,7 @@
#include "input/Init.hxx"
#include "input/InputStream.hxx"
#include "fs/Path.hxx"
#include "fs/NarrowPath.hxx"
#include "AudioFormat.hxx"
#include "util/OptionDef.hxx"
#include "util/OptionParser.hxx"
...
...
@@ -44,7 +45,7 @@ struct CommandLine {
const
char
*
decoder
=
nullptr
;
const
char
*
uri
=
nullptr
;
Path
config_path
=
nullptr
;
FromNarrowPath
config_path
;
bool
verbose
=
false
;
};
...
...
@@ -68,7 +69,7 @@ ParseCommandLine(int argc, char **argv)
while
(
auto
o
=
option_parser
.
Next
())
{
switch
(
Option
(
o
.
index
))
{
case
OPTION_CONFIG
:
c
.
config_path
=
Path
::
FromFS
(
o
.
value
)
;
c
.
config_path
=
o
.
value
;
break
;
case
OPTION_VERBOSE
:
...
...
@@ -118,7 +119,7 @@ try {
DumpDecoderClient
client
;
if
(
plugin
->
file_decode
!=
nullptr
)
{
try
{
plugin
->
FileDecode
(
client
,
Path
::
FromFS
(
c
.
uri
));
plugin
->
FileDecode
(
client
,
FromNarrowPath
(
c
.
uri
));
}
catch
(
StopDecoder
)
{
}
}
else
if
(
plugin
->
stream_decode
!=
nullptr
)
{
...
...
test/run_filter.cxx
View file @
9c66b041
...
...
@@ -19,6 +19,7 @@
#include "ConfigGlue.hxx"
#include "fs/Path.hxx"
#include "fs/NarrowPath.hxx"
#include "AudioParser.hxx"
#include "AudioFormat.hxx"
#include "filter/LoadOne.hxx"
...
...
@@ -68,7 +69,7 @@ try {
return
EXIT_FAILURE
;
}
const
Path
config_path
=
Path
::
FromFS
(
argv
[
1
])
;
const
FromNarrowPath
config_path
=
argv
[
1
]
;
AudioFormat
audio_format
(
44100
,
SampleFormat
::
S16
,
2
);
...
...
test/run_gunzip.cxx
View file @
9c66b041
...
...
@@ -20,6 +20,7 @@
#include "fs/io/GunzipReader.hxx"
#include "fs/io/FileReader.hxx"
#include "fs/io/StdioOutputStream.hxx"
#include "fs/NarrowPath.hxx"
#include "util/PrintException.hxx"
#include <stdio.h>
...
...
@@ -62,7 +63,7 @@ try {
return
EXIT_FAILURE
;
}
Path
path
=
Path
::
FromFS
(
argv
[
1
])
;
FromNarrowPath
path
=
argv
[
1
]
;
CopyGunzip
(
stdout
,
path
);
return
EXIT_SUCCESS
;
...
...
test/run_input.cxx
View file @
9c66b041
...
...
@@ -32,6 +32,7 @@
#include "Log.hxx"
#include "LogBackend.hxx"
#include "fs/Path.hxx"
#include "fs/NarrowPath.hxx"
#include "fs/io/BufferedOutputStream.hxx"
#include "fs/io/StdioOutputStream.hxx"
#include "util/ConstBuffer.hxx"
...
...
@@ -51,7 +52,7 @@
struct
CommandLine
{
const
char
*
uri
=
nullptr
;
Path
config_path
=
nullptr
;
FromNarrowPath
config_path
;
bool
verbose
=
false
;
...
...
@@ -79,7 +80,7 @@ ParseCommandLine(int argc, char **argv)
while
(
auto
o
=
option_parser
.
Next
())
{
switch
(
Option
(
o
.
index
))
{
case
OPTION_CONFIG
:
c
.
config_path
=
Path
::
FromFS
(
o
.
value
)
;
c
.
config_path
=
o
.
value
;
break
;
case
OPTION_VERBOSE
:
...
...
test/run_output.cxx
View file @
9c66b041
...
...
@@ -23,6 +23,7 @@
#include "ConfigGlue.hxx"
#include "event/Thread.hxx"
#include "fs/Path.hxx"
#include "fs/NarrowPath.hxx"
#include "AudioParser.hxx"
#include "pcm/PcmConvert.hxx"
#include "util/StringBuffer.hxx"
...
...
@@ -111,7 +112,7 @@ try {
return
EXIT_FAILURE
;
}
const
Path
config_path
=
Path
::
FromFS
(
argv
[
1
])
;
const
FromNarrowPath
config_path
=
argv
[
1
]
;
AudioFormat
audio_format
(
44100
,
SampleFormat
::
S16
,
2
);
...
...
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