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
8d41e965
Commit
8d41e965
authored
Oct 26, 2016
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Instance: remove Error parameter from GetDatabase()
parent
086652dd
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
11 additions
and
18 deletions
+11
-18
Instance.cxx
src/Instance.cxx
+0
-9
Instance.hxx
src/Instance.hxx
+3
-1
Partition.cxx
src/Partition.cxx
+2
-2
Partition.hxx
src/Partition.hxx
+1
-1
SongLoader.cxx
src/SongLoader.cxx
+1
-1
Client.cxx
src/client/Client.cxx
+2
-2
Client.hxx
src/client/Client.hxx
+1
-1
test_translate_song.cxx
test/test_translate_song.cxx
+1
-1
No files found.
src/Instance.cxx
View file @
8d41e965
...
...
@@ -35,15 +35,6 @@
#ifdef ENABLE_DATABASE
Database
*
Instance
::
GetDatabase
(
Error
&
error
)
{
if
(
database
==
nullptr
)
error
.
Set
(
db_domain
,
int
(
DatabaseErrorCode
::
DISABLED
),
"No database"
);
return
database
;
}
const
Database
&
Instance
::
GetDatabaseOrThrow
()
const
{
...
...
src/Instance.hxx
View file @
8d41e965
...
...
@@ -109,7 +109,9 @@ struct Instance final
* if this MPD configuration has no database (no
* music_directory was configured).
*/
Database
*
GetDatabase
(
Error
&
error
);
Database
*
GetDatabase
()
{
return
database
;
}
/**
* Returns the global #Database instance. Throws
...
...
src/Partition.cxx
View file @
8d41e965
...
...
@@ -45,9 +45,9 @@ Partition::EmitIdle(unsigned mask)
#ifdef ENABLE_DATABASE
const
Database
*
Partition
::
GetDatabase
(
Error
&
error
)
const
Partition
::
GetDatabase
()
const
{
return
instance
.
GetDatabase
(
error
);
return
instance
.
GetDatabase
();
}
const
Database
&
...
...
src/Partition.hxx
View file @
8d41e965
...
...
@@ -183,7 +183,7 @@ struct Partition final : QueueListener, PlayerListener, MixerListener {
* if this MPD configuration has no database (no
* music_directory was configured).
*/
const
Database
*
GetDatabase
(
Error
&
error
)
const
;
const
Database
*
GetDatabase
()
const
;
gcc_pure
const
Database
&
GetDatabaseOrThrow
()
const
;
...
...
src/SongLoader.cxx
View file @
8d41e965
...
...
@@ -32,7 +32,7 @@
#ifdef ENABLE_DATABASE
SongLoader
::
SongLoader
(
const
Client
&
_client
)
:
client
(
&
_client
),
db
(
_client
.
GetDatabase
(
IgnoreError
()
)),
:
client
(
&
_client
),
db
(
_client
.
GetDatabase
()),
storage
(
_client
.
GetStorage
())
{}
#endif
...
...
src/client/Client.cxx
View file @
8d41e965
...
...
@@ -28,9 +28,9 @@ const Domain client_domain("client");
#ifdef ENABLE_DATABASE
const
Database
*
Client
::
GetDatabase
(
Error
&
error
)
const
Client
::
GetDatabase
()
const
{
return
partition
.
instance
.
GetDatabase
(
error
);
return
partition
.
instance
.
GetDatabase
();
}
const
Database
&
...
...
src/client/Client.hxx
View file @
8d41e965
...
...
@@ -185,7 +185,7 @@ public:
* Wrapper for Instance::GetDatabase().
*/
gcc_pure
const
Database
*
GetDatabase
(
Error
&
error
)
const
;
const
Database
*
GetDatabase
()
const
;
/**
* Wrapper for Instance::GetDatabaseOrThrow().
...
...
test/test_translate_song.cxx
View file @
8d41e965
...
...
@@ -131,7 +131,7 @@ DetachedSong::LoadFile(Path path)
}
const
Database
*
Client
::
GetDatabase
(
gcc_unused
Error
&
error
)
const
Client
::
GetDatabase
()
const
{
return
reinterpret_cast
<
const
Database
*>
(
this
);
}
...
...
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