GLMixer Code

Graphic Live Mixer

Brought to you by: brunoherbelin

Commit [r551] Maximize Restore History

Implementation of Mixing Toolbox. This required to change quite a bit the SourcePropertyBrowser. Other changes has also been made to comply with the new possibilities to control the blending.

Authored by: bruno.herbelin@gmail.com 2012-10-26

Browse code at this revision

Parent: [r550]

Child: [r552]

changed	/trunk/images.qrc
changed	/trunk/shaders/imageProcessing_fragment.glsl
changed	/trunk/shaders/imageProcessing_fragment_simplified.glsl
changed	/trunk/src/MixingToolboxWidget.cpp
changed	/trunk/src/MixingToolboxWidget.h
changed	/trunk/src/MixingToolboxWidget.ui
changed	/trunk/src/SessionSwitcherWidget.cpp
changed	/trunk/src/Source.cpp
changed	/trunk/src/SourceDisplayWidget.cpp
changed	/trunk/src/SourceDisplayWidget.h
changed	/trunk/src/SourcePropertyBrowser.cpp
changed	/trunk/src/SourcePropertyBrowser.h
changed	/trunk/src/ViewRenderWidget.cpp
changed	/trunk/src/common.h
changed	/trunk/src/glmixer.cpp
changed	/trunk/src/glmixer.ui
changed	/trunk/src/main.cpp

/trunk/images.qrc Diff Switch to side-by-side view

/trunk/shaders/imageProcessing_fragment.glsl Diff Switch to side-by-side view

/trunk/shaders/imageProcessing_fragment_simplified.glsl Diff Switch to side-by-side view

/trunk/src/MixingToolboxWidget.cpp Diff Switch to side-by-side view

/trunk/src/MixingToolboxWidget.h Diff Switch to side-by-side view

/trunk/src/MixingToolboxWidget.ui Diff Switch to side-by-side view

/trunk/src/SessionSwitcherWidget.cpp Diff Switch to side-by-side view

/trunk/src/Source.cpp Diff Switch to side-by-side view

/trunk/src/SourceDisplayWidget.cpp Diff Switch to side-by-side view

/trunk/src/SourceDisplayWidget.h Diff Switch to side-by-side view

/trunk/src/SourcePropertyBrowser.cpp Diff Switch to side-by-side view

/trunk/src/SourcePropertyBrowser.h Diff Switch to side-by-side view

/trunk/src/ViewRenderWidget.cpp Diff Switch to side-by-side view

/trunk/src/common.h Diff Switch to side-by-side view

/trunk/src/glmixer.cpp Diff Switch to side-by-side view

/trunk/src/glmixer.ui Diff Switch to side-by-side view

/trunk/src/main.cpp Diff Switch to side-by-side view