comparison src/xs_sidplay.h @ 472:3f02945a0c48

Cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 25 Jan 2007 05:58:05 +0000
parents 6963982fcbb6
children 99f05a74de5b
comparison
equal deleted inserted replaced
471:1733f81f7480 472:3f02945a0c48
65 * similarly to our enums in xs_config.h ... 65 * similarly to our enums in xs_config.h ...
66 */ 66 */
67 i = myStatus->tuneInfo; 67 i = myStatus->tuneInfo;
68 i->sidModel = myInfo.sidModel; 68 i->sidModel = myInfo.sidModel;
69 69
70 if ((myStatus->currSong >= 1) && (myStatus->currSong < i->nsubTunes)) { 70 XSDEBUG("%s[%d]: %d, %d\n", i->sidFilename, myStatus->currSong, myInfo.songSpeed, myInfo.clockSpeed);
71 t_xs_subtuneinfo *t = &(i->subTunes[myStatus->currSong - 1]); 71
72 if ((myStatus->currSong > 0) && (myStatus->currSong <= i->nsubTunes)) {
73 gint tmpSpeed = -1;
72 74
73 switch (myInfo.songSpeed) { 75 switch (myInfo.clockSpeed) {
74 case SIDTUNE_SPEED_VBI: 76 case SIDTUNE_CLOCK_PAL: tmpSpeed = 50; break;
75 switch (myInfo.clockSpeed) { 77 case SIDTUNE_CLOCK_NTSC: tmpSpeed = 60; break;
76 case SIDTUNE_CLOCK_PAL:
77 t->tuneSpeed = 50;
78 break;
79
80 case SIDTUNE_CLOCK_NTSC:
81 t->tuneSpeed = 60;
82 break;
83
84 default:
85 t->tuneSpeed = -1;
86 break;
87 }
88 break;
89
90 case SIDTUNE_SPEED_CIA_1A:
91 t->tuneSpeed = 60;
92 break;
93
94 default: 78 default:
95 t->tuneSpeed = -1; 79 if (myInfo.songSpeed != 0)
80 tmpSpeed = myInfo.songSpeed;
96 break; 81 break;
97 } 82 }
83
84 i->subTunes[myStatus->currSong - 1].tuneSpeed = tmpSpeed;
98 } 85 }
99 86
100 return TRUE; 87 return TRUE;
101 } 88 }
102 89