Mercurial > hg > xmms-sid

comparison src/xs_fileinfo.c @ 798:4c5b695fd85e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename variables.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 07 Nov 2012 11:24:29 +0200
parents 8f0d11865742
children b02f934d8224
comparison
equal deleted inserted replaced
797:02512cbc6d9f 798:4c5b695fd85e
52 /* Check if control window exists, we are currently playing and have a tune */ 52 /* Check if control window exists, we are currently playing and have a tune */
53 if (xs_fileinfowin) { 53 if (xs_fileinfowin) {
54 gboolean isEnabled; 54 gboolean isEnabled;
55 GtkAdjustment *tmpAdj; 55 GtkAdjustment *tmpAdj;
56 56
57 if (xs_status.tuneInfo && xs_status.isPlaying && (xs_status.tuneInfo->nsubTunes > 1)) { 57 if (xs_status.tuneInfo && xs_status.playing && (xs_status.tuneInfo->nsubTunes > 1)) {
58 tmpAdj = gtk_range_get_adjustment(GTK_RANGE(LUW("fileinfo_subctrl_adj"))); 58 tmpAdj = gtk_range_get_adjustment(GTK_RANGE(LUW("fileinfo_subctrl_adj")));
59 59
60 tmpAdj->value = xs_status.currSong; 60 tmpAdj->value = xs_status.currSong;
61 tmpAdj->lower = 1; 61 tmpAdj->lower = 1;
62 tmpAdj->upper = xs_status.tuneInfo->nsubTunes; 62 tmpAdj->upper = xs_status.tuneInfo->nsubTunes;
85 gint n; 85 gint n;
86 86
87 XS_MUTEX_LOCK(xs_status); 87 XS_MUTEX_LOCK(xs_status);
88 XS_MUTEX_LOCK(xs_fileinfowin); 88 XS_MUTEX_LOCK(xs_fileinfowin);
89 89
90 if (xs_status.tuneInfo && xs_status.isPlaying) { 90 if (xs_status.tuneInfo && xs_status.playing) {
91 n = (gint) gtk_range_get_adjustment(GTK_RANGE(LUW("fileinfo_subctrl_adj")))->value; 91 n = (gint) gtk_range_get_adjustment(GTK_RANGE(LUW("fileinfo_subctrl_adj")))->value;
92 if ((n >= 1) && (n <= xs_status.tuneInfo->nsubTunes)) 92 if ((n >= 1) && (n <= xs_status.tuneInfo->nsubTunes))
93 xs_status.currSong = n; 93 xs_status.currSong = n;
94 } 94 }
95 95