Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Funkwhale Android
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
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
funkwhale
Funkwhale Android
Merge requests
!77
#65
: Upgrade exoplayer version
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
#65
: Upgrade exoplayer version
feature/65-upgrade-exoplayer
into
develop
Overview
1
Commits
2
Pipelines
7
Changes
7
Merged
Ryan Harg
requested to merge
feature/65-upgrade-exoplayer
into
develop
3 years ago
Overview
1
Commits
2
Pipelines
7
Changes
7
Expand
Closes
#65 (closed)
Edited
3 years ago
by
Ryan Harg
0
0
Merge request reports
Compare
develop
version 6
e913bd99
3 years ago
version 5
225dd4b2
3 years ago
version 4
fa803a31
3 years ago
version 3
b62fea22
3 years ago
version 2
46ccc71d
3 years ago
version 1
68d4aa4d
3 years ago
develop (base)
and
latest version
latest version
fe9d806d
2 commits,
3 years ago
version 6
e913bd99
1 commit,
3 years ago
version 5
225dd4b2
1 commit,
3 years ago
version 4
fa803a31
1 commit,
3 years ago
version 3
b62fea22
1 commit,
3 years ago
version 2
46ccc71d
1 commit,
3 years ago
version 1
68d4aa4d
1 commit,
3 years ago
7 files
+
47
−
52
Side-by-side
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
7
Search (e.g. *.vue) (Ctrl+P)
app/src/main/java/audio/funkwhale/ffa/koin/Modules.kt
+
7
−
12
Options
package
audio.funkwhale.ffa.koin
package
audio.funkwhale.ffa.koin
import
android.content.Context
import
android.content.Context
import
audio.funkwhale.ffa.R
import
audio.funkwhale.ffa.playback.CacheDataSourceFactoryProvider
import
audio.funkwhale.ffa.playback.CacheDataSourceFactoryProvider
import
audio.funkwhale.ffa.playback.MediaSession
import
audio.funkwhale.ffa.playback.MediaSession
import
audio.funkwhale.ffa.utils.AuthorizationServiceFactory
import
audio.funkwhale.ffa.utils.AuthorizationServiceFactory
import
audio.funkwhale.ffa.utils.OAuth
import
audio.funkwhale.ffa.utils.OAuth
import
com.google.android.exoplayer2.database.DatabaseProvider
import
com.google.android.exoplayer2.database.DatabaseProvider
import
com.google.android.exoplayer2.database.ExoDatabaseProvider
import
com.google.android.exoplayer2.database.ExoDatabaseProvider
import
com.google.android.exoplayer2.offline.DefaultDownloadIndex
import
com.google.android.exoplayer2.offline.DefaultDownloaderFactory
import
com.google.android.exoplayer2.offline.DownloadManager
import
com.google.android.exoplayer2.offline.DownloadManager
import
com.google.android.exoplayer2.offline.DownloaderConstructorHelper
import
com.google.android.exoplayer2.upstream.cache.Cache
import
com.google.android.exoplayer2.upstream.cache.Cache
import
com.google.android.exoplayer2.upstream.cache.LeastRecentlyUsedCacheEvictor
import
com.google.android.exoplayer2.upstream.cache.LeastRecentlyUsedCacheEvictor
import
com.google.android.exoplayer2.upstream.cache.NoOpCacheEvictor
import
com.google.android.exoplayer2.upstream.cache.NoOpCacheEvictor
@@ -27,15 +25,12 @@ fun exoplayerModule(context: Context) = module {
@@ -27,15 +25,12 @@ fun exoplayerModule(context: Context) = module {
single
{
single
{
val
cacheDataSourceFactoryProvider
=
get
<
CacheDataSourceFactoryProvider
>()
val
cacheDataSourceFactoryProvider
=
get
<
CacheDataSourceFactoryProvider
>()
DownloaderConstructorHelper
(
get
(
named
(
"exoDownloadCache"
)),
cacheDataSourceFactoryProvider
.
create
(
context
)
val
exoDownloadCache
=
get
<
Cache
>(
named
(
"exoDownloadCache"
))
).
run
{
val
exoDatabase
=
get
<
DatabaseProvider
>(
named
(
"exoDatabase"
))
DownloadManager
(
val
cacheDataSourceFactory
=
cacheDataSourceFactoryProvider
.
create
(
context
)
context
,
DefaultDownloadIndex
(
get
(
named
(
"exoDatabase"
))),
DownloadManager
(
context
,
exoDatabase
,
exoDownloadCache
,
cacheDataSourceFactory
,
Runnable
::
run
)
DefaultDownloaderFactory
(
this
)
)
}
}
}
single
{
single
{
Loading