Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,8 @@ dependencies {
implementation(project(":connectors:analytics:comscore"))
implementation(libs.comscore)

// FIXME Re-enable Yospace connector
// implementation(project(":connectors:yospace"))
// implementation(libs.yospace)
implementation(project(":connectors:yospace"))
implementation(libs.yospace)

implementation(project(":connectors:uplynk"))
}
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ import com.theoplayer.android.connector.uplynk.network.AssetInfoResponse
import com.theoplayer.android.connector.uplynk.network.PingResponse
import com.theoplayer.android.connector.uplynk.network.PreplayLiveResponse
import com.theoplayer.android.connector.uplynk.network.PreplayVodResponse
import com.theoplayer.android.connector.yospace.YospaceConnector
import com.theoplayer.android.ui.DefaultUI
import com.theoplayer.android.ui.rememberPlayer
import com.theoplayer.android.ui.theme.THEOplayerTheme
Expand All @@ -69,8 +70,7 @@ class MainActivity : ComponentActivity() {
private lateinit var convivaConnector: ConvivaConnector
private lateinit var nielsenConnector: NielsenConnector
private lateinit var comscoreConnector: ComscoreConnector
// FIXME Re-enable Yospace connector
// private lateinit var yospaceConnector: YospaceConnector
private lateinit var yospaceConnector: YospaceConnector
private lateinit var uplynkConnector: UplynkConnector

override fun onCreate(savedInstanceState: Bundle?) {
Expand Down Expand Up @@ -188,7 +188,7 @@ class MainActivity : ComponentActivity() {
}

private fun setupYospace() {
// yospaceConnector = YospaceConnector(theoplayerView)
yospaceConnector = YospaceConnector(theoplayerView)
}

private fun setupUplynk() {
Expand Down
5 changes: 2 additions & 3 deletions app/src/main/java/com/theoplayer/android/connector/Sources.kt
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import com.theoplayer.android.api.theolive.TheoLiveSource
import com.theoplayer.android.connector.uplynk.UplynkAssetType
import com.theoplayer.android.connector.uplynk.UplynkPingConfiguration
import com.theoplayer.android.connector.uplynk.UplynkSsaiDescription
import com.theoplayer.android.connector.yospace.YospaceSsaiDescription
import com.theoplayer.android.connector.yospace.YospaceStreamType
import java.util.Collections

data class Source(
Expand Down Expand Up @@ -66,8 +68,6 @@ val sources: List<Source> by lazy {
.metadata(MetadataDescription(mutableMapOf("title" to "THEOlive demo")))
.build()
),
// FIXME Re-enable Yospace connector
/*
Source(
name = "Yospace HLS VOD",
sourceDescription = SourceDescription
Expand Down Expand Up @@ -133,7 +133,6 @@ val sources: List<Source> by lazy {
)
.build()
),
*/
Source(
name = "Uplynk Ads",
sourceDescription = SourceDescription
Expand Down
3 changes: 1 addition & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@ dependencies {
dokka(project(":connectors:analytics:conviva"))
dokka(project(":connectors:analytics:nielsen"))
dokka(project(":connectors:mediasession"))
// FIXME Re-enable Yospace connector
// dokka(project(":connectors:yospace"))
dokka(project(":connectors:yospace"))
dokka(project(":connectors:uplynk"))
}

Expand Down
3 changes: 1 addition & 2 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,5 @@ include(":connectors:analytics:comscore")
include(":connectors:analytics:conviva")
include(":connectors:analytics:nielsen")
include(":connectors:mediasession")
// FIXME Re-enable Yospace connector after updating JFrog credentials
// include(":connectors:yospace")
include(":connectors:yospace")
include(":connectors:uplynk")
Loading