← Back to branch summary

~ubuntu-branches/ubuntu/raring/muse/raring

« back to all changes in this revision

Viewing changes to muse/master/lmaster.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Eric Hedekar, Eric Hedekar, Fabrice Coutadeur
  • Date: 2010-01-26 02:32:14 UTC
  • mfrom: (1.1.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20100126023214-8ez2g5d26d9p584j
Tags: 1.0.1-0ubuntu1
https://launchpad.net/bugs/479688
[ Eric Hedekar ]
* New upstream version (LP: #479688)
* Removed patches that were fixed in upstream source
  -[10_64bit_memcorruption_fix]
  -[10_gcc43_build_fixes]
  -[10_lash_private_api_fix]
  -[10_log2f_aliasing_fix]
  -[10_vamgui_init_fix]
  -[20_fix_const]

[ Fabrice Coutadeur ]
* debian/watch: added watch file
* debian/muse.desktop: deleted deprecated Encoding key, Application category
  and icon extension. This fix several warning with lintian and
  desktop-file-validate

Show diffs side-by-side

added added

removed removed

Lines of Context:
muse/master/lmaster.cpp
1
1
//=========================================================
2
2
//  MusE
3
3
//  Linux Music Editor
4
 
//    $Id: lmaster.cpp,v 1.2.2.5 2005/12/11 21:29:23 spamatica Exp $
 
4
//    $Id: lmaster.cpp,v 1.2.2.8 2009/03/09 02:05:18 terminator356 Exp $
5
5
//  (C) Copyright 2000 Werner Schweer (ws@seh.de)
6
6
//=========================================================
7
7
 
169
169
void LMaster::updateList()
170
170
      {
171
171
      LMasterLViewItem* selected = (LMasterLViewItem*) view->selectedItem();
172
 
      LMASTER_LVTYPE type;
173
 
      unsigned tick;
 
172
      LMASTER_LVTYPE type = LMASTER_TEMPO;
 
173
      unsigned tick = 0;
174
174
 
175
175
      if (selected) {
176
176
            type = selected->getType();
177
177
            tick = selected->tick();
178
178
            }
179
 
 
 
179
      
180
180
      view->clear();
181
181
      const TempoList* t = &tempomap;
182
182
      const SigList* s   = &sigmap;
209
209
            }
210
210
 
211
211
      // Try to reselect the previous selection:
212
 
      LMasterLViewItem* tmp = getItemAtPos(tick, type);
213
 
      if (tmp) {
214
 
         view->clearSelection();
215
 
         view->setSelected(tmp, true);
216
 
         }
217
 
      }
 
212
      if(selected)
 
213
      {
 
214
        LMasterLViewItem* tmp = getItemAtPos(tick, type);
 
215
        if (tmp) {
 
216
           view->clearSelection();
 
217
           view->setSelected(tmp, true);
 
218
           }
 
219
      }     
 
220
    }
218
221
 
219
222
//---------------------------------------------------------
220
223
//   readStatus