a_dinosaur/ZSNES
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tied existing audio options to new variables. XviD now functional.

Browse Source
This commit is contained in:
n-a-c-h
2006-03-02 01:20:50 +00:00
parent d5dabfff81
commit 9be033bd11
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
zsnes/src/cfg.psr
View File

@@ -350,8 +350,7 @@ NEWSYM PrevBuildNum, dd 0
NEWSYM PauseFocusChange, db 0 NEWSYM PauseFocusChange, db 0
NEWSYM KeyIncreaseGamma, dd 0 NEWSYM KeyIncreaseGamma, dd 0
NEWSYM KeyDecreaseGamma, dd 0 NEWSYM KeyDecreaseGamma, dd 0
NEWSYM MovieVideoMode, db 1 NEWSYM MovieVideoMode, db 4
NEWSYM MovieAudioMode, db 0
NEWSYM MovieAudio, db 1 NEWSYM MovieAudio, db 1
NEWSYM MovieVideoAudio, db 1 NEWSYM MovieVideoAudio, db 1
NEWSYM MovieAudioCompress, db 1 NEWSYM MovieAudioCompress, db 1

20
zsnes/src/zmovie.c
View File

@@ -1879,7 +1879,8 @@ extern unsigned int SoundQuality;
unsigned char AudioLogging; unsigned char AudioLogging;
extern unsigned char MovieVideoMode; extern unsigned char MovieVideoMode;
extern unsigned char MovieAudioMode; extern unsigned char MovieAudio;
extern unsigned char MovieVideoAudio;
extern char ZStartPath[PATH_MAX]; extern char ZStartPath[PATH_MAX];
@@ -1905,7 +1906,12 @@ static char *pick_var(char **str)
if (!strncmp(*str, "$md_vcodec", strlen("$md_vcodec"))) if (!strncmp(*str, "$md_vcodec", strlen("$md_vcodec")))
{ {
*str += strlen("$md_vcodec"); *str += strlen("$md_vcodec");
return(MovieVideoMode == 2 ? md_ffv1 : md_x264); switch (MovieVideoMode)
{
case 2: return(md_ffv1); break;
case 3: return(md_x264); break;
case 4: return(md_xvid); break;
}
} }
*str += strlen(*str); *str += strlen(*str);
fprintf(stderr, "Unknown Variable: %s", *str); fprintf(stderr, "Unknown Variable: %s", *str);
@@ -1968,7 +1974,7 @@ static void raw_video_close()
case 1: case 1:
fclose(raw_vid.vp); fclose(raw_vid.vp);
break; break;
case 2: case 3: case 2: case 3: case 4:
pclose(raw_vid.vp); pclose(raw_vid.vp);
break; break;
} }
@@ -1994,7 +2000,7 @@ static void raw_video_close()
AudioLogging = 0; AudioLogging = 0;
} }
if (audio_and_video && (MovieAudioMode == 2)) if (audio_and_video && MovieVideoAudio)
{ {
chdir(ZStartPath); chdir(ZStartPath);
if (mencoderExists) system(encode_command(md_merge)); if (mencoderExists) system(encode_command(md_merge));
@@ -2018,7 +2024,7 @@ static bool raw_video_open()
raw_vid.vp = fopen(md_raw_file, "wb"); raw_vid.vp = fopen(md_raw_file, "wb");
break; break;
case 2: case 3: case 2: case 3: case 4:
signal(SIGPIPE, broken_pipe); signal(SIGPIPE, broken_pipe);
mencoderExists = (unsigned char)(int)(raw_vid.vp = popen(encode_command(md_command), WRITE_BINARY)); mencoderExists = (unsigned char)(int)(raw_vid.vp = popen(encode_command(md_command), WRITE_BINARY));
break; break;
@@ -2028,12 +2034,12 @@ static bool raw_video_open()
break; break;
} }
if (!MovieAudioMode && raw_vid.vp) if (!MovieAudio && raw_vid.vp)
{ {
return(true); return(true);
} }
if ((!MovieVideoMode || raw_vid.vp) && MovieAudioMode) if ((!MovieVideoMode || raw_vid.vp) && MovieAudio)
{ {
if ((raw_vid.ap = fopen(md_pcm_audio, "wb"))) if ((raw_vid.ap = fopen(md_pcm_audio, "wb")))
{ {