Mercurial > hg > xmms-sid

comparison src/xs_title.c @ 472:3f02945a0c48

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 25 Jan 2007 05:58:05 +0000
parents d2e6682d3ef8
children 99f05a74de5b
comparison
equal deleted inserted replaced
471:1733f81f7480 472:3f02945a0c48
72 /* Extension */ 72 /* Extension */
73 tmpFileExt = xs_strrchr(p->sidFilename, '.'); 73 tmpFileExt = xs_strrchr(p->sidFilename, '.');
74 74
75 75
76 /* Get sub-tune information */ 76 /* Get sub-tune information */
77 if ((subTune >= 0) && (subTune < p->nsubTunes)) { 77 if ((subTune > 0) && (subTune <= p->nsubTunes)) {
78 subInfo = &(p->subTunes[subTune]); 78 subInfo = &(p->subTunes[subTune - 1]);
79 } else 79 } else
80 subInfo = NULL; 80 subInfo = NULL;
81 81
82 #ifdef HAVE_XMMSEXTRA 82 #ifdef HAVE_XMMSEXTRA
83 /* Check if the titles are overridden or not */ 83 /* Check if the titles are overridden or not */
94 ptInput->file_name = tmpFilename; 94 ptInput->file_name = tmpFilename;
95 ptInput->file_ext = tmpFileExt; 95 ptInput->file_ext = tmpFileExt;
96 ptInput->file_path = tmpFilePath; 96 ptInput->file_path = tmpFilePath;
97 97
98 ptInput->track_name = p->sidName; 98 ptInput->track_name = p->sidName;
99 ptInput->track_number = subTune + 1; 99 ptInput->track_number = subTune;
100 ptInput->album_name = NULL; 100 ptInput->album_name = NULL;
101 ptInput->performer = p->sidComposer; 101 ptInput->performer = p->sidComposer;
102 ptInput->date = (p->sidModel == XS_SIDMODEL_6581) ? "SID6581" : "SID8580"; 102 ptInput->date = (p->sidModel == XS_SIDMODEL_6581) ? "SID6581" : "SID8580";
103 103
104 ptInput->year = 0; 104 ptInput->year = 0;
164 VPUTSTR(tmpStr); 164 VPUTSTR(tmpStr);
165 } else 165 } else
166 VPUTSTR("?"); 166 VPUTSTR("?");
167 break; 167 break;
168 case 'n': 168 case 'n':
169 g_snprintf(tmpStr, XS_BUF_SIZE, "%i", subTune + 1); 169 g_snprintf(tmpStr, XS_BUF_SIZE, "%i", subTune);
170 VPUTSTR(tmpStr); 170 VPUTSTR(tmpStr);
171 break; 171 break;
172 case 'N': 172 case 'N':
173 g_snprintf(tmpStr, XS_BUF_SIZE, "%i", p->nsubTunes); 173 g_snprintf(tmpStr, XS_BUF_SIZE, "%i", p->nsubTunes);
174 VPUTSTR(tmpStr); 174 VPUTSTR(tmpStr);