Bump OpenGL capability on Windows

[vlc] / modules / video_output / decklink.cpp

diff --git a/modules/video_output/decklink.cpp b/modules/video_output/decklink.cpp
index 176038411ad3889ecaaeadc917ec507f1dae2517..95d6cff1912fa8a30930e8421a9204eeaffa4164 100644 (file)
--- a/modules/video_output/decklink.cpp
+++ b/modules/video_output/decklink.cpp
@@ -123,14 +123,6 @@ static const char *const ppsz_videoconns_text[] = {
     N_("SDI"), N_("HDMI"), N_("Optical SDI"), N_("Component"), N_("Composite"), N_("S-video")
 };
 
-static const char *const ppsz_audioconns[] = {
-    "embedded", "aesebu", "analog"
-};
-static const char *const ppsz_audioconns_text[] = {
-    N_("Embedded"), N_("AES/EBU"), N_("Analog")
-};
-
-
 struct vout_display_sys_t
 {
     picture_pool_t *pool;
@@ -154,7 +146,6 @@ struct decklink_sys_t
     vlc_mutex_t lock;
     vlc_cond_t cond;
     uint8_t users;
-    BMDAudioConnection aconn;
 
     //int i_channels;
     int i_rate;
@@ -216,9 +207,7 @@ vlc_module_begin()
     set_capability("audio output", 0)
     set_callbacks (OpenAudio, CloseAudio)
     set_section(N_("Decklink Audio Options"), NULL)
-    add_string(AUDIO_CFG_PREFIX "audio-connection", "embedded",
-                AUDIO_CONNECTION_TEXT, AUDIO_CONNECTION_LONGTEXT, true)
-                change_string_list(ppsz_audioconns, ppsz_audioconns_text)
+    add_obsolete_string("audio-connection")
     add_integer(AUDIO_CFG_PREFIX "audio-rate", 48000,
                 RATE_TEXT, RATE_LONGTEXT, true)
     add_integer(AUDIO_CFG_PREFIX "audio-channels", 2,
@@ -243,7 +232,7 @@ static struct decklink_sys_t *GetDLSys(vlc_object_t *obj)
             sys->p_output = NULL;
             sys->offset = 0;
             sys->users = 0;
-            sys->aconn = 0;
+            sys->i_rate = -1;
             vlc_mutex_init(&sys->lock);
             vlc_cond_init(&sys->cond);
             var_Create(libvlc, "decklink-sys", VLC_VAR_ADDRESS);
@@ -282,25 +271,6 @@ static void ReleaseDLSys(vlc_object_t *obj)
     vlc_mutex_unlock(&sys_lock);
 }
 
-// Connection mode
-static BMDAudioConnection getAConn(audio_output_t *aout)
-{
-    BMDAudioConnection conn = bmdAudioConnectionEmbedded;
-    char *psz = var_InheritString(aout, AUDIO_CFG_PREFIX "audio-connection");
-    if (!psz)
-        return conn;
-
-    if (!strcmp(psz, "embedded"))
-        conn = bmdAudioConnectionEmbedded;
-    else if (!strcmp(psz, "aesebu"))
-        conn = bmdAudioConnectionAESEBU;
-    else if (!strcmp(psz, "analog"))
-        conn = bmdAudioConnectionAnalog;
-
-    free(psz);
-    return conn;
-}
-
 static BMDVideoConnection getVConn(vout_display_t *vd)
 {
     BMDVideoConnection conn = bmdVideoConnectionSDI;
@@ -353,7 +323,7 @@ static struct decklink_sys_t *OpenDecklink(vout_display_t *vd)
     decklink_sys->users++;
 
     /* wait until aout is ready */
-    while (decklink_sys->aconn == 0)
+    while (decklink_sys->i_rate == -1)
         vlc_cond_wait(&decklink_sys->cond, &decklink_sys->lock);
 
     int i_card_index = var_InheritInteger(vd, CFG_PREFIX "card-index");
@@ -483,10 +453,6 @@ static struct decklink_sys_t *OpenDecklink(vout_display_t *vd)
         goto error;
     }
 
-    result = p_config->SetInt(
-        bmdDeckLinkConfigAudioInputConnection, decklink_sys->aconn);
-    CHECK("Could not set audio connection");
-
     if (/*decklink_sys->i_channels > 0 &&*/ decklink_sys->i_rate > 0)
     {
         result = decklink_sys->p_output->EnableAudioOutput(
@@ -510,6 +476,8 @@ static struct decklink_sys_t *OpenDecklink(vout_display_t *vd)
 
     vlc_mutex_unlock(&decklink_sys->lock);
 
+    vout_display_DeleteWindow(vd, NULL);
+
     return decklink_sys;
 
 error:
@@ -713,16 +681,8 @@ end:
 
 static int ControlVideo(vout_display_t *vd, int query, va_list args)
 {
-    VLC_UNUSED(vd);
-    const vout_display_cfg_t *cfg;
-
-    switch (query) {
-    case VOUT_DISPLAY_CHANGE_FULLSCREEN:
-        cfg = va_arg(args, const vout_display_cfg_t *);
-        return cfg->is_fullscreen ? VLC_EGENERIC : VLC_SUCCESS;
-    default:
-        return VLC_EGENERIC;
-    }
+    (void) vd; (void) query; (void) args;
+    return VLC_EGENERIC;
 }
 
 static int OpenVideo(vlc_object_t *p_this)
@@ -805,7 +765,7 @@ static void CloseVideo(vlc_object_t *p_this)
     vout_display_sys_t *sys = vd->sys;
 
     if (sys->pool)
-        picture_pool_Delete(sys->pool);
+        picture_pool_Release(sys->pool);
 
     if (sys->pic_nosignal)
         picture_Release(sys->pic_nosignal);
@@ -892,7 +852,6 @@ static int OpenAudio(vlc_object_t *p_this)
     struct decklink_sys_t *decklink_sys = GetDLSys(VLC_OBJECT(aout));
 
     vlc_mutex_lock(&decklink_sys->lock);
-    decklink_sys->aconn = getAConn(aout);
     //decklink_sys->i_channels = var_InheritInteger(vd, AUDIO_CFG_PREFIX "audio-channels");
     decklink_sys->i_rate = var_InheritInteger(aout, AUDIO_CFG_PREFIX "audio-rate");
     decklink_sys->users++;
@@ -916,7 +875,6 @@ static void CloseAudio(vlc_object_t *p_this)
 {
     struct decklink_sys_t *decklink_sys = GetDLSys(p_this);
     vlc_mutex_lock(&decklink_sys->lock);
-    decklink_sys->aconn = 0;
     vlc_mutex_unlock(&decklink_sys->lock);
     ReleaseDLSys(p_this);
 }