cailean
/
ofxPiMapper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Another attempt to fix TAB issue on RPi

master
Krisjanis Rijnieks 9 years ago
parent
2ef49511ca
commit
80885348cb
1 changed files with 18 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 33
      src/Commands/SetNextSourceCmd.cpp

33
src/Commands/SetNextSourceCmd.cpp
View File

@ -89,14 +89,15 @@ void SetNextSourceCmd::exec(){
mediaServer->unloadMedia(sourceId); mediaServer->unloadMedia(sourceId);
*/ */
if(_sources[_nextSourceIndex].type == SourceType::SOURCE_TYPE_FBO){ if(_sources[_nextSourceIndex].type == SourceType::SOURCE_TYPE_IMAGE){
_sourcesEditor->setFboSource(_sources[_nextSourceIndex].id); _sourcesEditor->setImageSource(_sources[_nextSourceIndex].id);
}else if(_sources[_nextSourceIndex].type == SourceType::SOURCE_TYPE_IMAGE){ }else if(_sources[_nextSourceIndex].type == SourceType::SOURCE_TYPE_VIDEO){
_sourcesEditor->setImageSource(_sources[_nextSourceIndex].id); _sourcesEditor->setVideoSource(_sources[_nextSourceIndex].id);
}else if(_sources[_nextSourceIndex].type == SourceType::SOURCE_TYPE_VIDEO){ }else if(_sources[_nextSourceIndex].type == SourceType::SOURCE_TYPE_FBO){
_sourcesEditor->setVideoSource(_sources[_nextSourceIndex].id); _sourcesEditor->setFboSource(_sources[_nextSourceIndex].id);
} }else if(_sources[_nextSourceIndex].type == SourceType::SOURCE_TYPE_NONE){
_sourcesEditor->clearSource();
}
} }
void SetNextSourceCmd::undo(){ void SetNextSourceCmd::undo(){
@ -115,13 +116,15 @@ void SetNextSourceCmd::undo(){
mediaServer->unloadMedia(_sources[_nextSourceIndex].id); mediaServer->unloadMedia(_sources[_nextSourceIndex].id);
*/ */
if(_sources[_sourceIndex].type == SourceType::SOURCE_TYPE_FBO){ if(_sources[_sourceIndex].type == SourceType::SOURCE_TYPE_IMAGE){
_sourcesEditor->setFboSource(_sources[_sourceIndex].id); _sourcesEditor->setImageSource(_sources[_sourceIndex].id);
}else if(_sources[_sourceIndex].type == SourceType::SOURCE_TYPE_IMAGE){ }else if(_sources[_sourceIndex].type == SourceType::SOURCE_TYPE_VIDEO){
_sourcesEditor->setImageSource(_sources[_sourceIndex].id); _sourcesEditor->setVideoSource(_sources[_sourceIndex].id);
}else if(_sources[_sourceIndex].type == SourceType::SOURCE_TYPE_VIDEO){ }else if(_sources[_sourceIndex].type == SourceType::SOURCE_TYPE_FBO){
_sourcesEditor->setVideoSource(_sources[_sourceIndex].id); _sourcesEditor->setFboSource(_sources[_sourceIndex].id);
} }else if(_sources[_sourceIndex].type == SourceType::SOURCE_TYPE_NONE){
_sourcesEditor->clearSource();
}
} }
} // namespace piMapper } // namespace piMapper

Write Preview
Loading…
Cancel
Save