From ad4a22038f7c09b2b4119e0e3cef3a04cd9e89fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jesper=20St=C3=A6rk=C3=A6r?= Date: Fri, 6 Jan 2017 16:10:40 +0100 Subject: [PATCH] added configVOs to config factory --- docs/classes/config.casparcgconfig.html | 58 +++++++++---------- docs/classes/config.intermediate.audio.html | 4 +- .../config.intermediate.mixconfig.html | 8 +-- docs/classes/config.intermediate.mixer.html | 8 +-- docs/classes/config.v207.audio.html | 4 +- .../classes/config.v207.bluefishconsumer.html | 10 ++-- .../classes/config.v207.casparcgconfigvo.html | 30 +++++----- docs/classes/config.v207.channel.html | 10 ++-- docs/classes/config.v207.channellayout.html | 10 ++-- docs/classes/config.v207.consumer.html | 2 +- .../classes/config.v207.decklinkconsumer.html | 20 +++---- docs/classes/config.v207.fileconsumer.html | 8 +-- docs/classes/config.v207.mixconfig.html | 10 ++-- docs/classes/config.v207.mixer.html | 8 +-- .../config.v207.newtekivgaconsumer.html | 6 +- docs/classes/config.v207.osc.html | 4 +- docs/classes/config.v207.paths.html | 10 ++-- docs/classes/config.v207.screenconsumer.html | 20 +++---- docs/classes/config.v207.streamconsumer.html | 6 +- .../config.v207.systemaudioconsumer.html | 2 +- docs/classes/config.v207.thumbnails.html | 16 ++--- docs/classes/config.v21x.audio.html | 4 +- .../classes/config.v21x.bluefishconsumer.html | 10 ++-- .../classes/config.v21x.casparcgconfigvo.html | 34 +++++------ docs/classes/config.v21x.channel.html | 10 ++-- docs/classes/config.v21x.channellayout.html | 10 ++-- docs/classes/config.v21x.consumer.html | 2 +- .../classes/config.v21x.decklinkconsumer.html | 18 +++--- docs/classes/config.v21x.ffmpegconsumer.html | 10 ++-- docs/classes/config.v21x.html.html | 2 +- docs/classes/config.v21x.mixconfig.html | 8 +-- docs/classes/config.v21x.mixer.html | 6 +- .../config.v21x.newtekivgaconsumer.html | 2 +- docs/classes/config.v21x.osc.html | 6 +- docs/classes/config.v21x.paths.html | 12 ++-- docs/classes/config.v21x.screenconsumer.html | 20 +++---- docs/classes/config.v21x.synctoconsumer.html | 4 +- .../config.v21x.systemaudioconsumer.html | 6 +- docs/classes/config.v21x.thumbnails.html | 16 ++--- .../classes/config.v2xx.bluefishconsumer.html | 10 ++-- .../classes/config.v2xx.casparcgconfigvo.html | 6 +- docs/classes/config.v2xx.channel.html | 10 ++-- docs/classes/config.v2xx.consumer.html | 2 +- docs/classes/config.v2xx.controller.html | 6 +- .../classes/config.v2xx.decklinkconsumer.html | 18 +++--- docs/classes/config.v2xx.flash.html | 2 +- docs/classes/config.v2xx.mixer.html | 6 +- .../config.v2xx.newtekivgaconsumer.html | 2 +- docs/classes/config.v2xx.osc.html | 4 +- docs/classes/config.v2xx.oscclient.html | 6 +- docs/classes/config.v2xx.screenconsumer.html | 18 +++--- .../config.v2xx.systemaudioconsumer.html | 2 +- docs/classes/config.v2xx.templatehost.html | 10 ++-- docs/classes/config.v2xx.thumbnails.html | 16 ++--- docs/index.html | 2 +- .../config.intermediate.icasparcgconfig.html | 6 +- docs/modules/config.html | 14 ++--- docs/modules/config.utils.html | 2 +- docs/modules/config.v21x.html | 8 +-- docs/modules/config.v2xx.html | 8 +-- js/lib/Config.d.ts | 4 +- js/lib/Config.js | 8 +++ src/lib/Config.ts | 12 +++- 63 files changed, 316 insertions(+), 300 deletions(-) diff --git a/docs/classes/config.casparcgconfig.html b/docs/classes/config.casparcgconfig.html index 53c2a5b9..c50a1a4c 100644 --- a/docs/classes/config.casparcgconfig.html +++ b/docs/classes/config.casparcgconfig.html @@ -152,7 +152,7 @@

constructor

  • Parameters

    @@ -166,7 +166,7 @@

    Returns

    Parameters

    @@ -188,7 +188,7 @@

    Private ___version

    ___version: ServerVersion
    @@ -198,7 +198,7 @@

    accelerator

    accelerator: string
    @@ -208,7 +208,7 @@

    audio

    audio: Audio
    @@ -218,7 +218,7 @@

    autoDeinterlace

    autoDeinterlace: boolean
    @@ -228,7 +228,7 @@

    autoTranscode

    autoTranscode: boolean
    @@ -238,7 +238,7 @@

    channelGrid

    channelGrid: boolean
    @@ -248,7 +248,7 @@

    channels

    channels: Array<Channel>
    @@ -258,7 +258,7 @@

    controllers

    controllers: Array<Controller>
    @@ -268,7 +268,7 @@

    flash

    flash: Flash
    @@ -278,7 +278,7 @@

    forceDeinterlace

    forceDeinterlace: boolean
    @@ -288,7 +288,7 @@

    html

    html: Html
    @@ -298,7 +298,7 @@

    lockClearPhrase

    lockClearPhrase: string |
    @@ -308,7 +308,7 @@

    logCategories

    logCategories: string
    @@ -318,7 +318,7 @@

    logLevel

    logLevel: string
    @@ -328,7 +328,7 @@

    mixer

    mixer: Mixer
    @@ -338,7 +338,7 @@

    osc

    osc: Osc
    @@ -348,7 +348,7 @@

    paths

    paths: Paths
    @@ -358,7 +358,7 @@

    pipelineTokens

    pipelineTokens: number
    @@ -368,7 +368,7 @@

    templateHosts

    templateHosts: Array<TemplateHost>
    @@ -378,7 +378,7 @@

    thumbnails

    thumbnails: Thumbnails
    @@ -395,7 +395,7 @@

    VO

  • Returns Config207VO @@ -415,7 +415,7 @@

    XML

  • Returns Object @@ -435,7 +435,7 @@

    v207VO

  • Returns Config207VO

    @@ -452,7 +452,7 @@

    v210VO

  • Returns Config210VO

    @@ -472,7 +472,7 @@

    import

  • Parameters

    @@ -495,7 +495,7 @@

    importFromV207VO

  • Parameters

    @@ -518,7 +518,7 @@

    importFromV210VO

  • Parameters

    diff --git a/docs/classes/config.intermediate.audio.html b/docs/classes/config.intermediate.audio.html index 51fb1263..9f21b820 100644 --- a/docs/classes/config.intermediate.audio.html +++ b/docs/classes/config.intermediate.audio.html @@ -103,7 +103,7 @@

    channelLayouts

    channelLayouts: Array<ChannelLayout>
    @@ -113,7 +113,7 @@

    mixConfigs

    mixConfigs: Array<MixConfig>
    diff --git a/docs/classes/config.intermediate.mixconfig.html b/docs/classes/config.intermediate.mixconfig.html index 4978958c..804af08a 100644 --- a/docs/classes/config.intermediate.mixconfig.html +++ b/docs/classes/config.intermediate.mixconfig.html @@ -105,7 +105,7 @@

    _type

    _type: string
    @@ -115,7 +115,7 @@

    fromType

    fromType: string
    @@ -125,7 +125,7 @@

    mix

    mix: object
    @@ -151,7 +151,7 @@

    toTypes

    toTypes: string
    diff --git a/docs/classes/config.intermediate.mixer.html b/docs/classes/config.intermediate.mixer.html index 5b0f8a9e..582741b6 100644 --- a/docs/classes/config.intermediate.mixer.html +++ b/docs/classes/config.intermediate.mixer.html @@ -111,7 +111,7 @@

    blendModes

    @@ -122,7 +122,7 @@

    chromaKey

    @@ -133,7 +133,7 @@

    mipmappingDefaultOn

    @@ -144,7 +144,7 @@

    straightAlpha

    diff --git a/docs/classes/config.v207.audio.html b/docs/classes/config.v207.audio.html index cdd7be7f..206cc439 100644 --- a/docs/classes/config.v207.audio.html +++ b/docs/classes/config.v207.audio.html @@ -103,7 +103,7 @@

    channelLayouts

    channelLayouts: Array<ChannelLayout>
    @@ -113,7 +113,7 @@

    mixConfigs

    mixConfigs: Array<MixConfig>
    diff --git a/docs/classes/config.v207.bluefishconsumer.html b/docs/classes/config.v207.bluefishconsumer.html index f628b1ae..e8c5cfc7 100644 --- a/docs/classes/config.v207.bluefishconsumer.html +++ b/docs/classes/config.v207.bluefishconsumer.html @@ -113,7 +113,7 @@

    _type

    Inherited from BluefishConsumer._type

    Overwrites Consumer._type

    @@ -124,7 +124,7 @@

    channelLayout

    @@ -135,7 +135,7 @@

    device

    @@ -146,7 +146,7 @@

    embeddedAudio

    @@ -157,7 +157,7 @@

    keyOnly

    diff --git a/docs/classes/config.v207.casparcgconfigvo.html b/docs/classes/config.v207.casparcgconfigvo.html index 77fc058b..e617f835 100644 --- a/docs/classes/config.v207.casparcgconfigvo.html +++ b/docs/classes/config.v207.casparcgconfigvo.html @@ -121,7 +121,7 @@

    _version

    _version: number
    @@ -131,7 +131,7 @@

    audio

    audio: Audio
    @@ -141,7 +141,7 @@

    autoDeinterlace

    autoDeinterlace: boolean
    @@ -151,7 +151,7 @@

    autoTranscode

    autoTranscode: boolean
    @@ -162,7 +162,7 @@

    channelGrid

    @@ -172,7 +172,7 @@

    channels

    channels: Array<Channel>
    @@ -182,7 +182,7 @@

    controllers

    controllers: Array<Controller>
    @@ -193,7 +193,7 @@

    flash

    @@ -203,7 +203,7 @@

    logLevel

    logLevel: string
    @@ -213,7 +213,7 @@

    mixer

    mixer: Mixer
    @@ -223,7 +223,7 @@

    osc

    osc: Osc
    @@ -233,7 +233,7 @@

    paths

    paths: Paths
    @@ -243,7 +243,7 @@

    pipelineTokens

    pipelineTokens: number
    @@ -254,7 +254,7 @@

    templateHosts

    @@ -264,7 +264,7 @@

    thumbnails

    thumbnails: Thumbnails
    diff --git a/docs/classes/config.v207.channel.html b/docs/classes/config.v207.channel.html index d89b19b9..62a0b3e9 100644 --- a/docs/classes/config.v207.channel.html +++ b/docs/classes/config.v207.channel.html @@ -112,7 +112,7 @@

    _type

    @@ -123,7 +123,7 @@

    channelLayout

    @@ -134,7 +134,7 @@

    consumers

    @@ -145,7 +145,7 @@

    straightAlphaOutput

    @@ -156,7 +156,7 @@

    videoMode

    diff --git a/docs/classes/config.v207.channellayout.html b/docs/classes/config.v207.channellayout.html index 935d255b..ed28eac0 100644 --- a/docs/classes/config.v207.channellayout.html +++ b/docs/classes/config.v207.channellayout.html @@ -106,7 +106,7 @@

    _type

    _type: string
    @@ -116,7 +116,7 @@

    channels

    channels: string
    @@ -126,7 +126,7 @@

    name

    name: string
    @@ -136,7 +136,7 @@

    numChannels

    numChannels: number |
    @@ -146,7 +146,7 @@

    type

    type: string
    diff --git a/docs/classes/config.v207.consumer.html b/docs/classes/config.v207.consumer.html index ab5cb92d..68abfd1e 100644 --- a/docs/classes/config.v207.consumer.html +++ b/docs/classes/config.v207.consumer.html @@ -108,7 +108,7 @@

    _type

    diff --git a/docs/classes/config.v207.decklinkconsumer.html b/docs/classes/config.v207.decklinkconsumer.html index 1d40d9f9..0947f048 100644 --- a/docs/classes/config.v207.decklinkconsumer.html +++ b/docs/classes/config.v207.decklinkconsumer.html @@ -118,7 +118,7 @@

    _type

    Inherited from DecklinkConsumer._type

    Overwrites Consumer._type

    @@ -129,7 +129,7 @@

    bufferDepth

    @@ -140,7 +140,7 @@

    channelLayout

    @@ -150,7 +150,7 @@

    customAllocator

    customAllocator: boolean
    @@ -161,7 +161,7 @@

    device

    @@ -172,7 +172,7 @@

    embeddedAudio

    @@ -183,7 +183,7 @@

    keyDevice

    @@ -194,7 +194,7 @@

    keyOnly

    @@ -205,7 +205,7 @@

    keyer

    @@ -216,7 +216,7 @@

    latency

    diff --git a/docs/classes/config.v207.fileconsumer.html b/docs/classes/config.v207.fileconsumer.html index c2355d2e..b8ba601d 100644 --- a/docs/classes/config.v207.fileconsumer.html +++ b/docs/classes/config.v207.fileconsumer.html @@ -111,7 +111,7 @@

    _type

    @@ -121,7 +121,7 @@

    path

    path: string
    @@ -131,7 +131,7 @@

    separateKey

    separateKey: boolean
    @@ -141,7 +141,7 @@

    vcodec

    vcodec: string
    diff --git a/docs/classes/config.v207.mixconfig.html b/docs/classes/config.v207.mixconfig.html index 1db75aa7..10940521 100644 --- a/docs/classes/config.v207.mixconfig.html +++ b/docs/classes/config.v207.mixconfig.html @@ -106,7 +106,7 @@

    _type

    _type: string
    @@ -116,7 +116,7 @@

    from

    from: string
    @@ -126,7 +126,7 @@

    mappings

    mappings: Array<string>
    @@ -136,7 +136,7 @@

    mix

    mix: string
    @@ -146,7 +146,7 @@

    to

    to: string
    diff --git a/docs/classes/config.v207.mixer.html b/docs/classes/config.v207.mixer.html index b0311ca1..7654fef9 100644 --- a/docs/classes/config.v207.mixer.html +++ b/docs/classes/config.v207.mixer.html @@ -116,7 +116,7 @@

    blendModes

    @@ -126,7 +126,7 @@

    chromaKey

    chromaKey: boolean
    @@ -137,7 +137,7 @@

    mipmappingDefaultOn

    @@ -148,7 +148,7 @@

    straightAlpha

    diff --git a/docs/classes/config.v207.newtekivgaconsumer.html b/docs/classes/config.v207.newtekivgaconsumer.html index a34bf392..488071de 100644 --- a/docs/classes/config.v207.newtekivgaconsumer.html +++ b/docs/classes/config.v207.newtekivgaconsumer.html @@ -111,7 +111,7 @@

    _type

    Inherited from NewtekIvgaConsumer._type

    Overwrites Consumer._type

    @@ -121,7 +121,7 @@

    channelLayout

    channelLayout: string
    @@ -131,7 +131,7 @@

    provideSync

    provideSync: boolean
    diff --git a/docs/classes/config.v207.osc.html b/docs/classes/config.v207.osc.html index acb763d6..fdfc3262 100644 --- a/docs/classes/config.v207.osc.html +++ b/docs/classes/config.v207.osc.html @@ -109,7 +109,7 @@

    defaultPort

    @@ -120,7 +120,7 @@

    predefinedClients

    diff --git a/docs/classes/config.v207.paths.html b/docs/classes/config.v207.paths.html index 43436a4f..8aa5a07b 100644 --- a/docs/classes/config.v207.paths.html +++ b/docs/classes/config.v207.paths.html @@ -106,7 +106,7 @@

    dataPath

    dataPath: string
    @@ -116,7 +116,7 @@

    logPath

    logPath: string
    @@ -126,7 +126,7 @@

    mediaPath

    mediaPath: string
    @@ -136,7 +136,7 @@

    templatePath

    templatePath: string
    @@ -146,7 +146,7 @@

    thumbnailsPath

    thumbnailsPath: string
    diff --git a/docs/classes/config.v207.screenconsumer.html b/docs/classes/config.v207.screenconsumer.html index b3eb7fbc..26a2e2ba 100644 --- a/docs/classes/config.v207.screenconsumer.html +++ b/docs/classes/config.v207.screenconsumer.html @@ -118,7 +118,7 @@

    _type

    Inherited from ScreenConsumer._type

    Overwrites Consumer._type

    @@ -129,7 +129,7 @@

    aspectRatio

    @@ -140,7 +140,7 @@

    autoDeinterlace

    @@ -151,7 +151,7 @@

    borderless

    @@ -162,7 +162,7 @@

    device

    @@ -173,7 +173,7 @@

    keyOnly

    @@ -183,7 +183,7 @@

    name

    name: string
    @@ -194,7 +194,7 @@

    stretch

    @@ -205,7 +205,7 @@

    vsync

    @@ -216,7 +216,7 @@

    windowed

    diff --git a/docs/classes/config.v207.streamconsumer.html b/docs/classes/config.v207.streamconsumer.html index fbe6f6a9..28d32166 100644 --- a/docs/classes/config.v207.streamconsumer.html +++ b/docs/classes/config.v207.streamconsumer.html @@ -110,7 +110,7 @@

    _type

    @@ -120,7 +120,7 @@

    args

    args: string
    @@ -130,7 +130,7 @@

    path

    path: string
    diff --git a/docs/classes/config.v207.systemaudioconsumer.html b/docs/classes/config.v207.systemaudioconsumer.html index 6cc6945b..30b6eef6 100644 --- a/docs/classes/config.v207.systemaudioconsumer.html +++ b/docs/classes/config.v207.systemaudioconsumer.html @@ -109,7 +109,7 @@

    _type

    Inherited from SystemAudioConsumer._type

    Overwrites Consumer._type

    diff --git a/docs/classes/config.v207.thumbnails.html b/docs/classes/config.v207.thumbnails.html index 05bbd4a3..5b6e7b53 100644 --- a/docs/classes/config.v207.thumbnails.html +++ b/docs/classes/config.v207.thumbnails.html @@ -115,7 +115,7 @@

    generateDelayMillis

    @@ -126,7 +126,7 @@

    generateThumbnails

    @@ -137,7 +137,7 @@

    height

    @@ -148,7 +148,7 @@

    mipmap

    @@ -159,7 +159,7 @@

    scanIntervalMillis

    @@ -170,7 +170,7 @@

    videoGrid

    @@ -181,7 +181,7 @@

    videoMode

    @@ -192,7 +192,7 @@

    width

    diff --git a/docs/classes/config.v21x.audio.html b/docs/classes/config.v21x.audio.html index 1a21cf23..ddba7883 100644 --- a/docs/classes/config.v21x.audio.html +++ b/docs/classes/config.v21x.audio.html @@ -103,7 +103,7 @@

    channelLayouts

    channelLayouts: Array<ChannelLayout>
    @@ -113,7 +113,7 @@

    mixConfigs

    mixConfigs: Array<MixConfig>
    diff --git a/docs/classes/config.v21x.bluefishconsumer.html b/docs/classes/config.v21x.bluefishconsumer.html index b1c24f4c..291360b4 100644 --- a/docs/classes/config.v21x.bluefishconsumer.html +++ b/docs/classes/config.v21x.bluefishconsumer.html @@ -113,7 +113,7 @@

    _type

    Inherited from BluefishConsumer._type

    Overwrites Consumer._type

    @@ -124,7 +124,7 @@

    channelLayout

    @@ -135,7 +135,7 @@

    device

    @@ -146,7 +146,7 @@

    embeddedAudio

    @@ -157,7 +157,7 @@

    keyOnly

    diff --git a/docs/classes/config.v21x.casparcgconfigvo.html b/docs/classes/config.v21x.casparcgconfigvo.html index 564aec06..f1b08749 100644 --- a/docs/classes/config.v21x.casparcgconfigvo.html +++ b/docs/classes/config.v21x.casparcgconfigvo.html @@ -123,7 +123,7 @@

    _version

    _version: number
    @@ -133,7 +133,7 @@

    accelerator

    accelerator: string
    @@ -143,7 +143,7 @@

    audio

    audio: Audio
    @@ -154,7 +154,7 @@

    channelGrid

    @@ -164,7 +164,7 @@

    channels

    channels: Array<Channel>
    @@ -174,7 +174,7 @@

    controllers

    controllers: Array<Controller>
    @@ -185,7 +185,7 @@

    flash

    @@ -195,7 +195,7 @@

    forceDeinterlace

    forceDeinterlace: boolean
    @@ -205,7 +205,7 @@

    html

    html: Html
    @@ -215,7 +215,7 @@

    lockClearPhrase

    lockClearPhrase: string
    @@ -225,7 +225,7 @@

    logCategories

    logCategories: string
    @@ -235,7 +235,7 @@

    logLevel

    logLevel: string
    @@ -245,7 +245,7 @@

    mixer

    mixer: Mixer
    @@ -255,7 +255,7 @@

    osc

    osc: Osc
    @@ -265,7 +265,7 @@

    paths

    paths: Paths
    @@ -276,7 +276,7 @@

    templateHosts

    @@ -286,7 +286,7 @@

    thumbnails

    thumbnails: Thumbnails
    diff --git a/docs/classes/config.v21x.channel.html b/docs/classes/config.v21x.channel.html index fa391223..cadff275 100644 --- a/docs/classes/config.v21x.channel.html +++ b/docs/classes/config.v21x.channel.html @@ -112,7 +112,7 @@

    _type

    @@ -123,7 +123,7 @@

    channelLayout

    @@ -134,7 +134,7 @@

    consumers

    @@ -145,7 +145,7 @@

    straightAlphaOutput

    @@ -156,7 +156,7 @@

    videoMode

    diff --git a/docs/classes/config.v21x.channellayout.html b/docs/classes/config.v21x.channellayout.html index c5668c52..fd826ce0 100644 --- a/docs/classes/config.v21x.channellayout.html +++ b/docs/classes/config.v21x.channellayout.html @@ -106,7 +106,7 @@

    _type

    _type: string
    @@ -116,7 +116,7 @@

    channelOrder

    channelOrder: string
    @@ -126,7 +126,7 @@

    name

    name: string
    @@ -136,7 +136,7 @@

    numChannels

    numChannels: number |
    @@ -146,7 +146,7 @@

    type

    type: string
    diff --git a/docs/classes/config.v21x.consumer.html b/docs/classes/config.v21x.consumer.html index 7701c072..7e53bf6a 100644 --- a/docs/classes/config.v21x.consumer.html +++ b/docs/classes/config.v21x.consumer.html @@ -108,7 +108,7 @@

    _type

    diff --git a/docs/classes/config.v21x.decklinkconsumer.html b/docs/classes/config.v21x.decklinkconsumer.html index 525e7f5b..a9f70265 100644 --- a/docs/classes/config.v21x.decklinkconsumer.html +++ b/docs/classes/config.v21x.decklinkconsumer.html @@ -117,7 +117,7 @@

    _type

    Inherited from DecklinkConsumer._type

    Overwrites Consumer._type

    @@ -128,7 +128,7 @@

    bufferDepth

    @@ -139,7 +139,7 @@

    channelLayout

    @@ -150,7 +150,7 @@

    device

    @@ -161,7 +161,7 @@

    embeddedAudio

    @@ -172,7 +172,7 @@

    keyDevice

    @@ -183,7 +183,7 @@

    keyOnly

    @@ -194,7 +194,7 @@

    keyer

    @@ -205,7 +205,7 @@

    latency

    diff --git a/docs/classes/config.v21x.ffmpegconsumer.html b/docs/classes/config.v21x.ffmpegconsumer.html index 88e4f4ba..b6dfb258 100644 --- a/docs/classes/config.v21x.ffmpegconsumer.html +++ b/docs/classes/config.v21x.ffmpegconsumer.html @@ -112,7 +112,7 @@

    _type

    @@ -122,7 +122,7 @@

    args

    args: string
    @@ -132,7 +132,7 @@

    monoStreams

    monoStreams: boolean
    @@ -142,7 +142,7 @@

    path

    path: string
    @@ -152,7 +152,7 @@

    separateKey

    separateKey: boolean
    diff --git a/docs/classes/config.v21x.html.html b/docs/classes/config.v21x.html.html index e26dc012..8bfb7f60 100644 --- a/docs/classes/config.v21x.html.html +++ b/docs/classes/config.v21x.html.html @@ -102,7 +102,7 @@

    remoteDebuggingPort

    remoteDebuggingPort: number |
    diff --git a/docs/classes/config.v21x.mixconfig.html b/docs/classes/config.v21x.mixconfig.html index 3dbdf25c..abcb9099 100644 --- a/docs/classes/config.v21x.mixconfig.html +++ b/docs/classes/config.v21x.mixconfig.html @@ -105,7 +105,7 @@

    _type

    _type: string
    @@ -115,7 +115,7 @@

    fromType

    fromType: string
    @@ -125,7 +125,7 @@

    mix

    mix: string
    @@ -135,7 +135,7 @@

    toTypes

    toTypes: string
    diff --git a/docs/classes/config.v21x.mixer.html b/docs/classes/config.v21x.mixer.html index b99f6db6..52b2efea 100644 --- a/docs/classes/config.v21x.mixer.html +++ b/docs/classes/config.v21x.mixer.html @@ -110,7 +110,7 @@

    blendModes

    @@ -121,7 +121,7 @@

    mipmappingDefaultOn

    @@ -132,7 +132,7 @@

    straightAlpha

    diff --git a/docs/classes/config.v21x.newtekivgaconsumer.html b/docs/classes/config.v21x.newtekivgaconsumer.html index 48e9c547..42921503 100644 --- a/docs/classes/config.v21x.newtekivgaconsumer.html +++ b/docs/classes/config.v21x.newtekivgaconsumer.html @@ -109,7 +109,7 @@

    _type

    Inherited from NewtekIvgaConsumer._type

    Overwrites Consumer._type

    diff --git a/docs/classes/config.v21x.osc.html b/docs/classes/config.v21x.osc.html index 845afc5b..ccc2e2a1 100644 --- a/docs/classes/config.v21x.osc.html +++ b/docs/classes/config.v21x.osc.html @@ -110,7 +110,7 @@

    defaultPort

    @@ -120,7 +120,7 @@

    disableSendToAmcpClients

    disableSendToAmcpClients: boolean
    @@ -131,7 +131,7 @@

    predefinedClients

    diff --git a/docs/classes/config.v21x.paths.html b/docs/classes/config.v21x.paths.html index 6ca56b6f..7c4dc01f 100644 --- a/docs/classes/config.v21x.paths.html +++ b/docs/classes/config.v21x.paths.html @@ -107,7 +107,7 @@

    dataPath

    dataPath: string
    @@ -117,7 +117,7 @@

    fontPath

    fontPath: string
    @@ -127,7 +127,7 @@

    logPath

    logPath: string
    @@ -137,7 +137,7 @@

    mediaPath

    mediaPath: string
    @@ -147,7 +147,7 @@

    templatePath

    templatePath: string
    @@ -157,7 +157,7 @@

    thumbnailPath

    thumbnailPath: string
    diff --git a/docs/classes/config.v21x.screenconsumer.html b/docs/classes/config.v21x.screenconsumer.html index 9e7cfc72..297853bb 100644 --- a/docs/classes/config.v21x.screenconsumer.html +++ b/docs/classes/config.v21x.screenconsumer.html @@ -118,7 +118,7 @@

    _type

    Inherited from ScreenConsumer._type

    Overwrites Consumer._type

    @@ -129,7 +129,7 @@

    aspectRatio

    @@ -140,7 +140,7 @@

    autoDeinterlace

    @@ -151,7 +151,7 @@

    borderless

    @@ -162,7 +162,7 @@

    device

    @@ -172,7 +172,7 @@

    interactive

    interactive: boolean
    @@ -183,7 +183,7 @@

    keyOnly

    @@ -194,7 +194,7 @@

    stretch

    @@ -205,7 +205,7 @@

    vsync

    @@ -216,7 +216,7 @@

    windowed

    diff --git a/docs/classes/config.v21x.synctoconsumer.html b/docs/classes/config.v21x.synctoconsumer.html index b9dd1a33..36f7a1b5 100644 --- a/docs/classes/config.v21x.synctoconsumer.html +++ b/docs/classes/config.v21x.synctoconsumer.html @@ -109,7 +109,7 @@

    _type

    @@ -119,7 +119,7 @@

    channelId

    channelId: Number |
    diff --git a/docs/classes/config.v21x.systemaudioconsumer.html b/docs/classes/config.v21x.systemaudioconsumer.html index 02ba9f74..488704e6 100644 --- a/docs/classes/config.v21x.systemaudioconsumer.html +++ b/docs/classes/config.v21x.systemaudioconsumer.html @@ -111,7 +111,7 @@

    _type

    Inherited from SystemAudioConsumer._type

    Overwrites Consumer._type

    @@ -121,7 +121,7 @@

    channelLayout

    channelLayout: string
    @@ -131,7 +131,7 @@

    latency

    latency: number
    diff --git a/docs/classes/config.v21x.thumbnails.html b/docs/classes/config.v21x.thumbnails.html index eb57940a..e4fed752 100644 --- a/docs/classes/config.v21x.thumbnails.html +++ b/docs/classes/config.v21x.thumbnails.html @@ -115,7 +115,7 @@

    generateDelayMillis

    @@ -126,7 +126,7 @@

    generateThumbnails

    @@ -137,7 +137,7 @@

    height

    @@ -148,7 +148,7 @@

    mipmap

    @@ -159,7 +159,7 @@

    scanIntervalMillis

    @@ -170,7 +170,7 @@

    videoGrid

    @@ -181,7 +181,7 @@

    videoMode

    @@ -192,7 +192,7 @@

    width

    diff --git a/docs/classes/config.v2xx.bluefishconsumer.html b/docs/classes/config.v2xx.bluefishconsumer.html index e0e23ff7..72543e59 100644 --- a/docs/classes/config.v2xx.bluefishconsumer.html +++ b/docs/classes/config.v2xx.bluefishconsumer.html @@ -120,7 +120,7 @@

    _type

    @@ -130,7 +130,7 @@

    channelLayout

    channelLayout: string
    @@ -140,7 +140,7 @@

    device

    device: number
    @@ -150,7 +150,7 @@

    embeddedAudio

    embeddedAudio: boolean
    @@ -160,7 +160,7 @@

    keyOnly

    keyOnly: boolean
    diff --git a/docs/classes/config.v2xx.casparcgconfigvo.html b/docs/classes/config.v2xx.casparcgconfigvo.html index 17a50a5f..785fd254 100644 --- a/docs/classes/config.v2xx.casparcgconfigvo.html +++ b/docs/classes/config.v2xx.casparcgconfigvo.html @@ -112,7 +112,7 @@

    channelGrid

    channelGrid: boolean
    @@ -122,7 +122,7 @@

    flash

    flash: Flash
    @@ -132,7 +132,7 @@

    templateHosts

    templateHosts: Array<TemplateHost>
    diff --git a/docs/classes/config.v2xx.channel.html b/docs/classes/config.v2xx.channel.html index 029e05b6..18e547a9 100644 --- a/docs/classes/config.v2xx.channel.html +++ b/docs/classes/config.v2xx.channel.html @@ -114,7 +114,7 @@

    _type

    _type: string
    @@ -124,7 +124,7 @@

    channelLayout

    channelLayout: string
    @@ -134,7 +134,7 @@

    consumers

    consumers: Array<Consumer>
    @@ -144,7 +144,7 @@

    straightAlphaOutput

    straightAlphaOutput: boolean
    @@ -154,7 +154,7 @@

    videoMode

    videoMode: string
    diff --git a/docs/classes/config.v2xx.consumer.html b/docs/classes/config.v2xx.consumer.html index d4eda0f1..0b5d68e5 100644 --- a/docs/classes/config.v2xx.consumer.html +++ b/docs/classes/config.v2xx.consumer.html @@ -137,7 +137,7 @@

    _type

    _type: string
    diff --git a/docs/classes/config.v2xx.controller.html b/docs/classes/config.v2xx.controller.html index f65190f6..e0aeae57 100644 --- a/docs/classes/config.v2xx.controller.html +++ b/docs/classes/config.v2xx.controller.html @@ -104,7 +104,7 @@

    _type

    _type: string
    @@ -114,7 +114,7 @@

    port

    port: number |
    @@ -124,7 +124,7 @@

    protocol

    protocol: string
    diff --git a/docs/classes/config.v2xx.decklinkconsumer.html b/docs/classes/config.v2xx.decklinkconsumer.html index 267fd4e6..217414af 100644 --- a/docs/classes/config.v2xx.decklinkconsumer.html +++ b/docs/classes/config.v2xx.decklinkconsumer.html @@ -124,7 +124,7 @@

    _type

    @@ -134,7 +134,7 @@

    bufferDepth

    bufferDepth: number
    @@ -144,7 +144,7 @@

    channelLayout

    channelLayout: string
    @@ -154,7 +154,7 @@

    device

    device: number
    @@ -164,7 +164,7 @@

    embeddedAudio

    embeddedAudio: boolean
    @@ -174,7 +174,7 @@

    keyDevice

    keyDevice: Number |
    @@ -184,7 +184,7 @@

    keyOnly

    keyOnly: boolean
    @@ -194,7 +194,7 @@

    keyer

    keyer: string
    @@ -204,7 +204,7 @@

    latency

    latency: string
    diff --git a/docs/classes/config.v2xx.flash.html b/docs/classes/config.v2xx.flash.html index 6d5bcb82..2fc0ae8c 100644 --- a/docs/classes/config.v2xx.flash.html +++ b/docs/classes/config.v2xx.flash.html @@ -102,7 +102,7 @@

    bufferDepth

    bufferDepth: string | number
    diff --git a/docs/classes/config.v2xx.mixer.html b/docs/classes/config.v2xx.mixer.html index d2689335..6904a411 100644 --- a/docs/classes/config.v2xx.mixer.html +++ b/docs/classes/config.v2xx.mixer.html @@ -112,7 +112,7 @@

    blendModes

    blendModes: boolean
    @@ -122,7 +122,7 @@

    mipmappingDefaultOn

    mipmappingDefaultOn: boolean
    @@ -132,7 +132,7 @@

    straightAlpha

    straightAlpha: boolean
    diff --git a/docs/classes/config.v2xx.newtekivgaconsumer.html b/docs/classes/config.v2xx.newtekivgaconsumer.html index 22ae21f9..c7fd3242 100644 --- a/docs/classes/config.v2xx.newtekivgaconsumer.html +++ b/docs/classes/config.v2xx.newtekivgaconsumer.html @@ -116,7 +116,7 @@

    _type

    diff --git a/docs/classes/config.v2xx.osc.html b/docs/classes/config.v2xx.osc.html index 3350792f..8784f63b 100644 --- a/docs/classes/config.v2xx.osc.html +++ b/docs/classes/config.v2xx.osc.html @@ -111,7 +111,7 @@

    defaultPort

    defaultPort: number
    @@ -121,7 +121,7 @@

    predefinedClients

    predefinedClients: Array<OscClient>
    diff --git a/docs/classes/config.v2xx.oscclient.html b/docs/classes/config.v2xx.oscclient.html index a0457ed4..5a80f2a1 100644 --- a/docs/classes/config.v2xx.oscclient.html +++ b/docs/classes/config.v2xx.oscclient.html @@ -104,7 +104,7 @@

    _type

    _type: string
    @@ -114,7 +114,7 @@

    address

    address: string
    @@ -124,7 +124,7 @@

    port

    port: number |
    diff --git a/docs/classes/config.v2xx.screenconsumer.html b/docs/classes/config.v2xx.screenconsumer.html index 7ab1efc7..3de9ea99 100644 --- a/docs/classes/config.v2xx.screenconsumer.html +++ b/docs/classes/config.v2xx.screenconsumer.html @@ -124,7 +124,7 @@

    _type

    @@ -134,7 +134,7 @@

    aspectRatio

    aspectRatio: string
    @@ -144,7 +144,7 @@

    autoDeinterlace

    autoDeinterlace: boolean
    @@ -154,7 +154,7 @@

    borderless

    borderless: boolean
    @@ -164,7 +164,7 @@

    device

    device: number
    @@ -174,7 +174,7 @@

    keyOnly

    keyOnly: boolean
    @@ -184,7 +184,7 @@

    stretch

    stretch: string
    @@ -194,7 +194,7 @@

    vsync

    vsync: boolean
    @@ -204,7 +204,7 @@

    windowed

    windowed: boolean
    diff --git a/docs/classes/config.v2xx.systemaudioconsumer.html b/docs/classes/config.v2xx.systemaudioconsumer.html index c8f3ef1c..d9099cb1 100644 --- a/docs/classes/config.v2xx.systemaudioconsumer.html +++ b/docs/classes/config.v2xx.systemaudioconsumer.html @@ -116,7 +116,7 @@

    _type

    diff --git a/docs/classes/config.v2xx.templatehost.html b/docs/classes/config.v2xx.templatehost.html index 38370858..cffd6745 100644 --- a/docs/classes/config.v2xx.templatehost.html +++ b/docs/classes/config.v2xx.templatehost.html @@ -106,7 +106,7 @@

    _type

    _type: string
    @@ -116,7 +116,7 @@

    filename

    filename: string
    @@ -126,7 +126,7 @@

    height

    height: number |
    @@ -136,7 +136,7 @@

    videoMode

    videoMode: string
    @@ -146,7 +146,7 @@

    width

    width: number |
    diff --git a/docs/classes/config.v2xx.thumbnails.html b/docs/classes/config.v2xx.thumbnails.html index 0608764d..3683ffd4 100644 --- a/docs/classes/config.v2xx.thumbnails.html +++ b/docs/classes/config.v2xx.thumbnails.html @@ -117,7 +117,7 @@

    generateDelayMillis

    generateDelayMillis: number
    @@ -127,7 +127,7 @@

    generateThumbnails

    generateThumbnails: boolean
    @@ -137,7 +137,7 @@

    height

    height: number
    @@ -147,7 +147,7 @@

    mipmap

    mipmap: boolean
    @@ -157,7 +157,7 @@

    scanIntervalMillis

    scanIntervalMillis: number
    @@ -167,7 +167,7 @@

    videoGrid

    videoGrid: number
    @@ -177,7 +177,7 @@

    videoMode

    videoMode: string
    @@ -187,7 +187,7 @@

    width

    width: number
    diff --git a/docs/index.html b/docs/index.html index c94a301d..2eddf380 100644 --- a/docs/index.html +++ b/docs/index.html @@ -128,7 +128,7 @@

    namespace

    namespace: Object | undefined
    diff --git a/docs/interfaces/config.intermediate.icasparcgconfig.html b/docs/interfaces/config.intermediate.icasparcgconfig.html index 112765eb..1e80ac80 100644 --- a/docs/interfaces/config.intermediate.icasparcgconfig.html +++ b/docs/interfaces/config.intermediate.icasparcgconfig.html @@ -108,7 +108,7 @@

    import

  • Parameters

    @@ -131,7 +131,7 @@

    importFromV207VO

  • Parameters

    @@ -154,7 +154,7 @@

    importFromV210VO

  • Parameters

    diff --git a/docs/modules/config.html b/docs/modules/config.html index aeacac10..d453b081 100644 --- a/docs/modules/config.html +++ b/docs/modules/config.html @@ -107,8 +107,8 @@

    channels

    channels: unknown
    @@ -118,8 +118,8 @@

    controllers

    controllers: unknown
    @@ -129,7 +129,7 @@

    paths

    paths: Paths
    @@ -139,8 +139,8 @@

    xml

    xml: unknown
    diff --git a/docs/modules/config.utils.html b/docs/modules/config.utils.html index f99196cc..76da2cb7 100644 --- a/docs/modules/config.utils.html +++ b/docs/modules/config.utils.html @@ -95,7 +95,7 @@

    Type aliases

    FactyoryTypes

    -
    FactyoryTypes: Consumer | Channel | Controller | OscClient | TemplateHost | ChannelLayout | MixConfig | ChannelLayout | MixConfig | undefined
    +
    FactyoryTypes: CasparCGConfigVO | CasparCGConfigVO | Consumer | Channel | Controller | OscClient | TemplateHost | ChannelLayout | MixConfig | ChannelLayout | MixConfig | undefined
    @@ -143,7 +143,7 @@

    protocol

    protocol: string
    diff --git a/docs/modules/config.v2xx.html b/docs/modules/config.v2xx.html index acd35c2e..abbbfa26 100644 --- a/docs/modules/config.v2xx.html +++ b/docs/modules/config.v2xx.html @@ -111,7 +111,7 @@

    defaultAMCPController

    defaultAMCPController: object
    @@ -120,7 +120,7 @@

    _type

    _type: string
    @@ -130,7 +130,7 @@

    port

    port: number
    @@ -140,7 +140,7 @@

    protocol

    protocol: string
    diff --git a/js/lib/Config.d.ts b/js/lib/Config.d.ts index e2236710..89b1c500 100644 --- a/js/lib/Config.d.ts +++ b/js/lib/Config.d.ts @@ -4,8 +4,8 @@ import ServerVersion = OptionsNS.ServerVersion; export declare namespace Config { /** */ namespace Utils { - type factoryMembers = "channel" | "decklink" | "bluefish" | "system-audio" | "screen" | "newtek-ivga" | "ffmpeg" | "file" | "ffmpeg" | "stream" | "syncto" | "tcp" | "predefined-client" | "template-host" | "channel-layout" | "mix-config"; - type FactyoryTypes = v2xx.Consumer | v2xx.Channel | v2xx.Controller | v2xx.OscClient | v2xx.TemplateHost | v207.ChannelLayout | v207.MixConfig | v21x.ChannelLayout | v21x.MixConfig | undefined; + type factoryMembers = "config" | "channel" | "decklink" | "bluefish" | "system-audio" | "screen" | "newtek-ivga" | "ffmpeg" | "file" | "ffmpeg" | "stream" | "syncto" | "tcp" | "predefined-client" | "template-host" | "channel-layout" | "mix-config"; + type FactyoryTypes = v207.CasparCGConfigVO | v21x.CasparCGConfigVO | v2xx.Consumer | v2xx.Channel | v2xx.Controller | v2xx.OscClient | v2xx.TemplateHost | v207.ChannelLayout | v207.MixConfig | v21x.ChannelLayout | v21x.MixConfig | undefined; function configMemberFactory(version: ServerVersion, memberName: factoryMembers | string, initValues?: Object): FactyoryTypes; } /** */ diff --git a/js/lib/Config.js b/js/lib/Config.js index 4da5dd4f..15526a4c 100644 --- a/js/lib/Config.js +++ b/js/lib/Config.js @@ -17,6 +17,14 @@ var Config; function configMemberFactory(version, memberName, initValues) { var member = undefined; switch (memberName) { + case "config": + if (version < 2100) { + member = new v207.CasparCGConfigVO(); + } + else { + member = new v21x.CasparCGConfigVO(); + } + break; case "channel": if (version < 2100) { member = new v207.Channel(); diff --git a/src/lib/Config.ts b/src/lib/Config.ts index f6218baa..be521ed5 100644 --- a/src/lib/Config.ts +++ b/src/lib/Config.ts @@ -9,13 +9,21 @@ export namespace Config { /** */ export namespace Utils { - export type factoryMembers = "channel" | "decklink" | "bluefish" | "system-audio" | "screen" | "newtek-ivga" | "ffmpeg" | "file" | "ffmpeg" | "stream" | "syncto" | "tcp" | "predefined-client" | "template-host" | "channel-layout" | "mix-config"; - export type FactyoryTypes = v2xx.Consumer | v2xx.Channel | v2xx.Controller | v2xx.OscClient | v2xx.TemplateHost | v207.ChannelLayout | v207.MixConfig | v21x.ChannelLayout | v21x.MixConfig | undefined; + export type factoryMembers = "config" | "channel" | "decklink" | "bluefish" | "system-audio" | "screen" | "newtek-ivga" | "ffmpeg" | "file" | "ffmpeg" | "stream" | "syncto" | "tcp" | "predefined-client" | "template-host" | "channel-layout" | "mix-config"; + export type FactyoryTypes = v207.CasparCGConfigVO | v21x.CasparCGConfigVO | v2xx.Consumer | v2xx.Channel | v2xx.Controller | v2xx.OscClient | v2xx.TemplateHost | v207.ChannelLayout | v207.MixConfig | v21x.ChannelLayout | v21x.MixConfig | undefined; export function configMemberFactory(version: ServerVersion, memberName: factoryMembers | string, initValues?: Object): FactyoryTypes { let member: FactyoryTypes = undefined; switch (memberName) { + case "config": + if (version < 2100) { + member = new v207.CasparCGConfigVO(); + } else { + member = new v21x.CasparCGConfigVO(); + } + break; + case "channel": if (version < 2100) { member = new v207.Channel();