archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

added a labelbutton that displays the selected avi/quicktime codec.

Browse Source
This commit is contained in:
Rob Haarsma
2003-05-09 11:24:55 +00:00
parent 81d2589d6a
commit f8803db66d
7 changed files with 64 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/src/buttons.c
View File

@@ -6577,7 +6577,11 @@ void renderbuts(void)
if(G.scene->r.imtype == R_QUICKTIME) {
#ifdef WITH_QUICKTIME
#if defined (_WIN32) || defined (__APPLE__)
uiDefBut(block, BUT,B_SELECTCODEC, "Codec settings", 892,yofs,112,20, 0, 0, 0, 0, 0, "Set codec settings for Quicktime Codec");
if(!have_qtcodec)
uiDefBut(block, LABEL, 0, "Codec: undefined", 892,yofs+42,225,20, 0, 0, 0, 0, 0, "");
else
uiDefBut(block, LABEL, 0, qtcdname, 892,yofs+42,225,20, 0, 0, 0, 0, 0, "");
uiDefBut(block, BUT,B_SELECTCODEC, "Set codec", 892,yofs,112,20, 0, 0, 0, 0, 0, "Set codec settings for Quicktime");
#else /* libquicktime */
if (!G.scene->r.qtcodecdata) G.scene->r.qtcodecdata = MEM_callocN(sizeof(QtCodecData), "QtCodecData");
uiDefButI(block, MENU, B_SELECTCODEC, qtcodecs_pup(), 892,yofs, 112, 20, &qtcodec_idx, 0, 0, 0, 0, "Codec");
@@ -6595,7 +6599,11 @@ void renderbuts(void)
#endif /* libquicktime */
#endif /* WITH_QUICKTIME */
} else {
uiDefBut(block, BUT,B_SELECTCODEC, "Codec settings", 892,yofs,112,20, 0, 0, 0, 0, 0, "Set codec settings for AVI Codec");
if(!have_avicodec)
uiDefBut(block, LABEL, 0, "Codec: not set.", 892,yofs+42,225,20, 0, 0, 0, 0, 0, "");
else
uiDefBut(block, LABEL, 0, avicdname, 892,yofs+42,225,20, 0, 0, 0, 0, 0, "");
uiDefBut(block, BUT,B_SELECTCODEC, "Set codec", 892,yofs,112,20, 0, 0, 0, 0, 0, "Set codec settings for AVI");
}
} else {
uiDefButS(block, NUM,0, "Quality:", 892,yofs,112,20, &G.scene->r.quality, 10.0, 100.0, 0, 0, "Quality setting for JPEG images, AVI Jpeg and SGI movies");

8
source/blender/src/usiblender.c
View File

@@ -227,16 +227,8 @@ int BIF_read_homefile(void)
U.fontsize= 12;
U.encoding= 0;
sprintf(U.fontname, ".bfont.ttf");
if( FTF_SetFont(".bfont.ttf", 12) ) {
FTF_SetLanguage("en");
FTF_SetEncoding("ASCII");
G.ui_international = TRUE;
} else {
G.ui_international = FALSE;
}
}
*/
if(U.transopts & TR_ALL)
set_ML_interface_font();
else

21
source/blender/src/writeavicodec.c
View File

@@ -64,6 +64,8 @@
// the output video stream
AVICOMPRESSOPTIONS opts;
char avicdname[128];
int have_avicodec= 0;
static int sframe;
static PAVIFILE pfile = NULL;
@@ -345,7 +347,7 @@ HRESULT STDMETHODCALLTYPE AVIBallReadFormat (PAVISTREAM ps, LONG lPos,LPVOID l
*/
*lpcbFormat = sizeof(BITMAPINFOHEADER);
return AVIERR_OK;
}
@@ -767,6 +769,8 @@ int get_avicodec_settings(void)
AVICOMPRESSOPTIONS *aopts[1] = {&opts};
AviCodecData *acd = G.scene->r.avicodecdata;
static PAVISTREAM psdummy;
HIC hic;
ICINFO icinfo;
acd_to_opts(G.scene->r.avicodecdata);
@@ -777,12 +781,27 @@ int get_avicodec_settings(void)
} else {
if (!AVISaveOptions(NULL,
ICMF_CHOOSE_KEYFRAME | ICMF_CHOOSE_DATARATE,
// ICMF_CHOOSE_ALLCOMPRESSORS,
1,
&psdummy,
(LPAVICOMPRESSOPTIONS *) &aopts))
{
ret_val = 1;
} else {
have_avicodec = 1;
if ((hic=ICOpen(ICTYPE_VIDEO,opts.fccHandler,ICMODE_QUERY))!=NULL) {
icinfo.dwSize=sizeof(ICINFO);
if (ICGetInfo(hic,&icinfo,sizeof(ICINFO))) {
WideCharToMultiByte(CP_ACP,0,icinfo.szDescription,-1,avicdname,128,NULL,NULL);
} else
sprintf(avicdname, "undefined");
if (ICClose(hic)!=ICERR_OK)
return 0;
} else {
sprintf(avicdname, "Full Frames (Uncompressed)"); //heh, nasty
}
if (acd) {
free_avicodecdata(acd);
} else {