GLMixer Code

Graphic Live Mixer

Brought to you by: brunoherbelin

Commit [r683] Maximize Restore History

Merged r679 into Agalma branch, and made some changes that allows it to run on OSX. This still has bugs though - bmd doesn't work, and FFGL plugin stack just crashes right away.

Authored by: onar3d@gmail.com 2013-07-10

Browse code at this revision

Parent: [r682]

Child: [r684]

changed	/branches/agalma/CMakeLists.txt.user
changed	/branches/agalma/icons.qrc
added	/branches/agalma/icons/ffgl-source.png
changed	/branches/agalma/src/CMakeLists.txt
changed	/branches/agalma/src/CameraDialog.cpp
changed	/branches/agalma/src/FFGLPluginSource.cpp
changed	/branches/agalma/src/FFGLPluginSource.h
added	/branches/agalma/src/FFGLPluginSourceStack.cpp
added	/branches/agalma/src/FFGLPluginSourceStack.h
added	/branches/agalma/src/FFGLSource.cpp
added	/branches/agalma/src/FFGLSource.h
changed	/branches/agalma/src/OpencvSource.cpp
changed	/branches/agalma/src/OpencvSource.h
changed	/branches/agalma/src/RenderingManager.cpp
changed	/branches/agalma/src/RenderingManager.h
changed	/branches/agalma/src/Source.cpp
changed	/branches/agalma/src/Source.h
changed	/branches/agalma/src/SourcePropertyBrowser.cpp
changed	/branches/agalma/src/glmixer.cpp
changed	/branches/agalma/src/glmixer.h
changed	/branches/agalma/src/glmixer.ui

/branches/agalma/CMakeLists.txt.user Diff Switch to side-by-side view

/branches/agalma/icons.qrc Diff Switch to side-by-side view

/branches/agalma/icons/ffgl-source.png

Binary file was added.

/branches/agalma/src/CMakeLists.txt Diff Switch to side-by-side view

/branches/agalma/src/CameraDialog.cpp Diff Switch to side-by-side view

/branches/agalma/src/FFGLPluginSource.cpp Diff Switch to side-by-side view

/branches/agalma/src/FFGLPluginSource.h Diff Switch to side-by-side view

/branches/agalma/src/FFGLPluginSourceStack.cpp Diff Switch to side-by-side view

/branches/agalma/src/FFGLPluginSourceStack.h Diff Switch to side-by-side view

/branches/agalma/src/FFGLSource.cpp Diff Switch to side-by-side view

/branches/agalma/src/FFGLSource.h Diff Switch to side-by-side view

/branches/agalma/src/OpencvSource.cpp Diff Switch to side-by-side view

/branches/agalma/src/OpencvSource.h Diff Switch to side-by-side view

/branches/agalma/src/RenderingManager.cpp Diff Switch to side-by-side view

/branches/agalma/src/RenderingManager.h Diff Switch to side-by-side view

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

/branches/agalma/src/Source.h Diff Switch to side-by-side view

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

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

/branches/agalma/src/glmixer.h Diff Switch to side-by-side view

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