From 8fa6cd8c94e8dfe1dda24ad4c723da2d09fd17a7 Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Sat, 8 Nov 2003 21:00:09 +0000 Subject: [PATCH] - added popup warning when choosing quicktime at OSX. this to notify that the 'options' button in QT dialog freezes. Will ask Apple for hints... no clue why this happens. --- source/blender/src/buttons_scene.c | 49 +++++++++++++++--------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/source/blender/src/buttons_scene.c b/source/blender/src/buttons_scene.c index e86198250e2..199ef01fa11 100644 --- a/source/blender/src/buttons_scene.c +++ b/source/blender/src/buttons_scene.c @@ -569,49 +569,48 @@ void do_render_panels(unsigned short event) } #else /* libquicktime */ if(G.scene->r.imtype == R_QUICKTIME) { - /* i'm not sure if this should be here... */ - /* set default quicktime codec */ - if (!G.scene->r.qtcodecdata) { - G.scene->r.qtcodecdata = MEM_callocN(sizeof(QtCodecData), - "QtCodecData"); - qtcodec_idx = 1; - } + /* i'm not sure if this should be here... */ + /* set default quicktime codec */ + if (!G.scene->r.qtcodecdata) { + G.scene->r.qtcodecdata = MEM_callocN(sizeof(QtCodecData), "QtCodecData"); + qtcodec_idx = 1; + } - qt_init_codecs(); - if (qtcodec_idx < 1) qtcodec_idx = 1; + qt_init_codecs(); + if (qtcodec_idx < 1) qtcodec_idx = 1; - G.scene->r.qtcodecdata->fourcc = - qtcodecidx_to_fcc(qtcodec_idx-1); - qt_init_codecdata(G.scene->r.qtcodecdata); + G.scene->r.qtcodecdata->fourcc = qtcodecidx_to_fcc(qtcodec_idx-1); + qt_init_codecdata(G.scene->r.qtcodecdata); /* I'm not sure if this is really needed, so don't remove it yet */ #if 0 - /* get index of codec that can handle a given fourcc */ - if (qtcodec_idx < 1) - qtcodec_idx = get_qtcodec_idx(G.scene->r.qtcodecdata->fourcc)+1; + /* get index of codec that can handle a given fourcc */ + if (qtcodec_idx < 1) + qtcodec_idx = get_qtcodec_idx(G.scene->r.qtcodecdata->fourcc)+1; - /* no suitable codec found, alert user */ - if (qtcodec_idx < -1) { - error("no suitable codec found!"); - qtcodec_idx = 1; - } + /* no suitable codec found, alert user */ + if (qtcodec_idx < -1) { + error("no suitable codec found!"); + qtcodec_idx = 1; + } #endif /* 0 */ } #endif /*_WIN32 || __APPLE__ */ case B_SELECTCODEC: #if defined (_WIN32) || defined (__APPLE__) - if ((G.scene->r.imtype == R_QUICKTIME)) /* || (G.scene->r.qtcodecdata)) */ + if ((G.scene->r.imtype == R_QUICKTIME)) { /* || (G.scene->r.qtcodecdata)) */ + notice("Warning: the 'Options' button in the next dialog causes a freeze..."); get_qtcodec_settings(); + } #ifdef _WIN32 else get_avicodec_settings(); #endif /* _WIN32 */ #else /* libquicktime */ - if (!G.scene->r.qtcodecdata) { - G.scene->r.qtcodecdata = MEM_callocN(sizeof(QtCodecData), - "QtCodecData"); + if (!G.scene->r.qtcodecdata) { + G.scene->r.qtcodecdata = MEM_callocN(sizeof(QtCodecData), "QtCodecData"); qtcodec_idx = 1; - } + } if (qtcodec_idx < 1) { qtcodec_idx = 1; qt_init_codecs();