Mercurial > hg > svapp
comparison framework/MainWindowBase.cpp @ 132:3b61a975b47e sv1-v1.3 sv1-v1.3rc1
* Updates for 1.3
author | Chris Cannam |
---|---|
date | Thu, 10 Jul 2008 12:50:56 +0000 |
parents | 4c9c04645685 |
children | b6dfdd99bd60 |
comparison
equal
deleted
inserted
replaced
131:883f7fc7fd34 | 132:3b61a975b47e |
---|---|
871 } | 871 } |
872 | 872 |
873 MainWindowBase::FileOpenStatus | 873 MainWindowBase::FileOpenStatus |
874 MainWindowBase::openAudio(FileSource source, AudioFileOpenMode mode) | 874 MainWindowBase::openAudio(FileSource source, AudioFileOpenMode mode) |
875 { | 875 { |
876 std::cerr << "MainWindowBase::openAudio(" << source.getLocation().toStdString() << ")" << std::endl; | 876 // std::cerr << "MainWindowBase::openAudio(" << source.getLocation().toStdString() << ")" << std::endl; |
877 | 877 |
878 if (!source.isAvailable()) return FileOpenFailed; | 878 if (!source.isAvailable()) return FileOpenFailed; |
879 source.waitForData(); | 879 source.waitForData(); |
880 | 880 |
881 m_openingAudioFile = true; | 881 m_openingAudioFile = true; |
892 delete newModel; | 892 delete newModel; |
893 m_openingAudioFile = false; | 893 m_openingAudioFile = false; |
894 return FileOpenFailed; | 894 return FileOpenFailed; |
895 } | 895 } |
896 | 896 |
897 std::cerr << "mode = " << mode << std::endl; | 897 // std::cerr << "mode = " << mode << std::endl; |
898 | 898 |
899 if (mode == AskUser) { | 899 if (mode == AskUser) { |
900 if (getMainModel()) { | 900 if (getMainModel()) { |
901 | 901 |
902 static bool prevSetAsMain = true; | 902 static bool prevSetAsMain = true; |
2178 } | 2178 } |
2179 | 2179 |
2180 void | 2180 void |
2181 MainWindowBase::layerAboutToBeDeleted(Layer *layer) | 2181 MainWindowBase::layerAboutToBeDeleted(Layer *layer) |
2182 { | 2182 { |
2183 std::cerr << "MainWindowBase::layerAboutToBeDeleted(" << layer << ")" << std::endl; | 2183 // std::cerr << "MainWindowBase::layerAboutToBeDeleted(" << layer << ")" << std::endl; |
2184 | 2184 |
2185 removeLayerEditDialog(layer); | 2185 removeLayerEditDialog(layer); |
2186 | 2186 |
2187 if (m_timeRulerLayer && (layer == m_timeRulerLayer)) { | 2187 if (m_timeRulerLayer && (layer == m_timeRulerLayer)) { |
2188 // std::cerr << "(this is the time ruler layer)" << std::endl; | 2188 // std::cerr << "(this is the time ruler layer)" << std::endl; |
2191 } | 2191 } |
2192 | 2192 |
2193 void | 2193 void |
2194 MainWindowBase::layerInAView(Layer *layer, bool inAView) | 2194 MainWindowBase::layerInAView(Layer *layer, bool inAView) |
2195 { | 2195 { |
2196 std::cerr << "MainWindowBase::layerInAView(" << layer << "," << inAView << ")" << std::endl; | 2196 // std::cerr << "MainWindowBase::layerInAView(" << layer << "," << inAView << ")" << std::endl; |
2197 | 2197 |
2198 if (!inAView) removeLayerEditDialog(layer); | 2198 if (!inAView) removeLayerEditDialog(layer); |
2199 | 2199 |
2200 // Check whether we need to add or remove model from play source | 2200 // Check whether we need to add or remove model from play source |
2201 Model *model = layer->getModel(); | 2201 Model *model = layer->getModel(); |