Branch: refs/heads/geoff_import
Home: http://github.com/VLMC/vlmc
Commit: e45495cf65c4fe04ed98b9b63747e23cab69ecf8
http://github.com/VLMC/vlmc/commit/e45495cf65c4fe04ed98b9b63747e23cab69ecf8
Author: Hugo Beauzee-Luyssen <beauz...@gmail.com>
Date: 2009-10-30 (Fri, 30 Oct 2009)
Changed paths:
M src/GUI/TracksView.cpp
M src/GUI/TracksView.h
Log Message:
-----------
Removed unused attribute and include
Commit: 53d776e8a35c85541cdf9bb67896fa3ad660552e
http://github.com/VLMC/vlmc/commit/53d776e8a35c85541cdf9bb67896fa3ad660552e
Author: Geoffroy Lacarriere <geoffroyl...@gmail.com>
Date: 2009-10-30 (Fri, 30 Oct 2009)
Changed paths:
A src/GUI/ClickableLabel.cpp
A src/GUI/ClickableLabel.h
A src/GUI/FileInfoListModel.cpp
A src/GUI/FileInfoListModel.h
A src/GUI/Import.cpp
A src/GUI/Import.h
A src/GUI/Import/ImportController.cpp
A src/GUI/Import/ImportController.h
A src/GUI/Import/ImportModel.cpp
A src/GUI/Import/ImportModel.h
A src/GUI/Import/ui/ImportController.ui
A src/GUI/ImportBrowser.cpp
A src/GUI/ImportBrowser.h
A src/GUI/ImportMediaCellView.cpp
A src/GUI/ImportMediaCellView.h
A src/GUI/ImportMediaListController.cpp
A src/GUI/ImportMediaListController.h
A src/GUI/Library/ListViewController.cpp
A src/GUI/Library/ListViewController.h
A src/GUI/Library/MediaCellView.cpp
A src/GUI/Library/MediaCellView.h
A src/GUI/Library/MediaLibraryWidget.cpp
A src/GUI/Library/MediaLibraryWidget.h
A src/GUI/Library/MediaListViewController.cpp
A src/GUI/Library/MediaListViewController.h
A src/GUI/Library/StackViewController.cpp
A src/GUI/Library/StackViewController.h
A src/GUI/Library/StackViewNavController.cpp
A src/GUI/Library/StackViewNavController.h
A src/GUI/Library/StackViewNavController.ui
A src/GUI/Library/ViewController.h
A src/GUI/Library/ui/MediaCellView.ui
A src/GUI/Library/ui/StackViewNavController.ui
M src/GUI/MainWindow.cpp
M src/GUI/MainWindow.h
M src/GUI/ProjectPreferences.cpp
M src/GUI/ProjectPreferences.h
A src/GUI/TagWidget.cpp
A src/GUI/TagWidget.h
M src/GUI/Transcode.h
A src/GUI/ui/Import.ui
A src/GUI/ui/ImportBrowser.ui
M src/GUI/ui/MainWindow.ui
M src/GUI/ui/ProjectPreferences.ui
A src/GUI/ui/TagWidget.ui
M src/GUI/ui/VideoProjectPreferences.ui
M src/Library/Library.cpp
M src/Library/Library.h
M src/Media/Clip.h
M src/Media/Media.cpp
M src/Media/Media.h
M src/Metadata/MetaDataManager.cpp
M src/Metadata/MetaDataManager.h
M vlmc.pro
Log Message:
-----------
Merge branch 'geoff_import'
Commit: fed11d2bc18c53ba80d1689d4adb2d86d48fd504
http://github.com/VLMC/vlmc/commit/fed11d2bc18c53ba80d1689d4adb2d86d48fd504
Author: Geoffroy Lacarriere <geoffroyl...@gmail.com>
Date: 2009-10-30 (Fri, 30 Oct 2009)
Changed paths:
M src/GUI/Import.h
R src/GUI/ImportBrowser.cpp
R src/GUI/ImportBrowser.h
R src/GUI/ui/ImportBrowser.ui
Log Message:
-----------
Bug fix of master branch.
Commit: f287c7b9dfc60fc386e91c263320e455b61c452a
http://github.com/VLMC/vlmc/commit/f287c7b9dfc60fc386e91c263320e455b61c452a
Author: Geoffroy Lacarriere <geoffroyl...@gmail.com>
Date: 2009-10-30 (Fri, 30 Oct 2009)
Changed paths:
M src/GUI/Library/MediaLibraryWidget.cpp
M src/GUI/Library/MediaLibraryWidget.h
M src/GUI/Library/MediaListViewController.cpp
M src/GUI/Library/MediaListViewController.h
M src/GUI/MainWindow.cpp
M src/Library/Library.cpp
Log Message:
-----------
Bugfix: junk signal
Selection media cell in Library
Commit: 027c82ad531b8d151aa28dc12849232c8221f944
http://github.com/VLMC/vlmc/commit/027c82ad531b8d151aa28dc12849232c8221f944
Author: Hugo Beauzee-Luyssen <beauz...@gmail.com>
Date: 2009-10-30 (Fri, 30 Oct 2009)
Changed paths:
M src/Workflow/MainWorkflow.cpp
Log Message:
-----------
Fixed a bug that was preventing render to start when a clip hasn't been move.
Commit: 2eef5aa5dc712fe557151503eba24c9083bc95b1
http://github.com/VLMC/vlmc/commit/2eef5aa5dc712fe557151503eba24c9083bc95b1
Author: Hugo Beauzee-Luyssen <beauz...@gmail.com>
Date: 2009-10-30 (Fri, 30 Oct 2009)
Changed paths:
M src/EffectsEngine/MixerEffect.cpp
M src/Workflow/TrackHandler.cpp
Log Message:
-----------
Fixed mixer effect to respect tracks priority
Commit: b68f0a2c36365dbff46eee62f3fe6cb93c6b36b9
http://github.com/VLMC/vlmc/commit/b68f0a2c36365dbff46eee62f3fe6cb93c6b36b9
Author: Hugo Beauzee-Luyssen <beauz...@gmail.com>
Date: 2009-10-30 (Fri, 30 Oct 2009)
Changed paths:
M src/Workflow/TrackHandler.cpp
M src/Workflow/TrackHandler.h
Log Message:
-----------
Solved frame persistence bug.
Commit: fb8de08b91105350955eaf7cf9f89f7833047c6c
http://github.com/VLMC/vlmc/commit/fb8de08b91105350955eaf7cf9f89f7833047c6c
Author: Geoffroy Lacarriere <geoffroyl...@gmail.com>
Date: 2009-10-30 (Fri, 30 Oct 2009)
Changed paths:
M src/GUI/MainWindow.cpp
Log Message:
-----------
Restore of the old library
Commit: 27cc8f4401691769068872e4e48cec3d2d036b0d
http://github.com/VLMC/vlmc/commit/27cc8f4401691769068872e4e48cec3d2d036b0d
Author: Ludovic Fauvet <e...@l0cal.com>
Date: 2009-10-30 (Fri, 30 Oct 2009)
Changed paths:
A src/GUI/PreviewRuler.cpp
A src/GUI/PreviewRuler.h
M src/GUI/PreviewWidget.cpp
M src/GUI/PreviewWidget.h
M src/GUI/ui/PreviewWidget.ui
M src/Renderer/ClipRenderer.cpp
M src/Renderer/ClipRenderer.h
M src/Renderer/GenericRenderer.h
M src/Renderer/WorkflowRenderer.h
M vlmc.pro
Log Message:
-----------
New advanced slider added into the preview's dock widget
Commit: 6e59e4f0f917978e3fa5330050a85e1554ebd192
http://github.com/VLMC/vlmc/commit/6e59e4f0f917978e3fa5330050a85e1554ebd192
Author: Ludovic Fauvet <e...@l0cal.com>
Date: 2009-10-30 (Fri, 30 Oct 2009)
Changed paths:
R src/GUI/Slider.cpp
R src/GUI/Slider.h
M vlmc.pro
Log Message:
-----------
Code not in use anymore
Commit: c28f514cd3f0002a98cfcee305e8f5d92d244bdb
http://github.com/VLMC/vlmc/commit/c28f514cd3f0002a98cfcee305e8f5d92d244bdb
Author: Geoffroy Lacarriere <geoffroyl...@gmail.com>
Date: 2009-10-30 (Fri, 30 Oct 2009)
Changed paths:
A images/audio.png
A images/video.png
M ressources.qrc
M src/GUI/MainWindow.cpp
Log Message:
-----------
Bug fix images in preferences now fetch from resources.
Commit: f553cec75acbb8204f5a9ae2bbb53338ecd83af8
http://github.com/VLMC/vlmc/commit/f553cec75acbb8204f5a9ae2bbb53338ecd83af8
Author: Ludovic Fauvet <e...@l0cal.com>
Date: 2009-11-03 (Tue, 03 Nov 2009)
Changed paths:
M src/GUI/PreviewRuler.cpp
Log Message:
-----------
Preview: Ruler improvements
Commit: 5708a059743d8bc205b380804aac2ef1652e51ef
http://github.com/VLMC/vlmc/commit/5708a059743d8bc205b380804aac2ef1652e51ef
Author: Ludovic Fauvet <e...@l0cal.com>
Date: 2009-11-03 (Tue, 03 Nov 2009)
Changed paths:
A src/GUI/LCDTimecode.cpp
A src/GUI/LCDTimecode.h
M vlmc.pro
Log Message:
-----------
Introduce a new widget for displaying timecodes
Commit: b9623fcc9b07fb6fafb6026559ace7df9d66cb3a
http://github.com/VLMC/vlmc/commit/b9623fcc9b07fb6fafb6026559ace7df9d66cb3a
Author: Ludovic Fauvet <e...@l0cal.com>
Date: 2009-11-03 (Tue, 03 Nov 2009)
Changed paths:
M src/GUI/PreviewRuler.cpp
M src/GUI/PreviewRuler.h
M src/GUI/PreviewWidget.cpp
M src/GUI/ui/PreviewWidget.ui
Log Message:
-----------
Display the current playback timecode in the preview's dock
Commit: fa3541d4ab2e17f4a3b64c1f212b3f64485b3194
http://github.com/VLMC/vlmc/commit/fa3541d4ab2e17f4a3b64c1f212b3f64485b3194
Author: Hugo Beauzee-Luyssen <beauz...@gmail.com>
Date: 2009-11-03 (Tue, 03 Nov 2009)
Changed paths:
M src/Workflow/MainWorkflow.cpp
M src/Workflow/MainWorkflow.h
Log Message:
-----------
Added getCurrentFrame method in MainWorkflow
Commit: d969d03d6d0aea3a9c500fea2e054715b713279f
http://github.com/VLMC/vlmc/commit/d969d03d6d0aea3a9c500fea2e054715b713279f
Author: Hugo Beauzee-Luyssen <beauz...@gmail.com>
Date: 2009-11-03 (Tue, 03 Nov 2009)
Changed paths:
M src/Renderer/ClipRenderer.cpp
M src/Renderer/ClipRenderer.h
M src/Renderer/GenericRenderer.h
M src/Renderer/WorkflowRenderer.cpp
M src/Renderer/WorkflowRenderer.h
Log Message:
-----------
Adding a getCurrentFrame getter for all renderers.
Commit: 30296decf6628630e33190d445dbccf233e8b10b
http://github.com/VLMC/vlmc/commit/30296decf6628630e33190d445dbccf233e8b10b
Author: Hugo Beauzee-Luyssen <beauz...@gmail.com>
Date: 2009-11-03 (Tue, 03 Nov 2009)
Changed paths:
M src/Workflow/TrackHandler.cpp
Log Message:
-----------
Removed debug
Commit: 01669f05e43225755705592ff0b3e0075539e1fd
http://github.com/VLMC/vlmc/commit/01669f05e43225755705592ff0b3e0075539e1fd
Author: Hugo Beauzee-Luyssen <beauz...@gmail.com>
Date: 2009-11-03 (Tue, 03 Nov 2009)
Changed paths:
M src/Workflow/MainWorkflow.cpp
M src/Workflow/MainWorkflow.h
M src/Workflow/TrackHandler.cpp
M src/Workflow/TrackHandler.h
Log Message:
-----------
Fixed pause/unpause bug
Commit: d3f1275c7c1c2310dfa3122c319f2d6a41075814
http://github.com/VLMC/vlmc/commit/d3f1275c7c1c2310dfa3122c319f2d6a41075814
Author: Hugo Beauzee-Luyssen <beauz...@gmail.com>
Date: 2009-11-03 (Tue, 03 Nov 2009)
Changed paths:
M src/GUI/MainWindow.cpp
M src/Renderer/WorkflowRenderer.cpp
M src/Workflow/MainWorkflow.cpp
M src/Workflow/MainWorkflow.h
Log Message:
-----------
Renamed MainWorkflow::getLength to MainWorkflow::getLengthFrame
Commit: 1cf1785e7672c7a4c64efc068785bb663f6660fa
http://github.com/VLMC/vlmc/commit/1cf1785e7672c7a4c64efc068785bb663f6660fa
Author: Hugo Beauzee-Luyssen <beauz...@gmail.com>
Date: 2009-11-03 (Tue, 03 Nov 2009)
Changed paths:
M src/GUI/PreviewRuler.cpp
M src/Renderer/ClipRenderer.cpp
M src/Renderer/ClipRenderer.h
M src/Renderer/GenericRenderer.h
M src/Renderer/WorkflowRenderer.cpp
M src/Renderer/WorkflowRenderer.h
Log Message:
-----------
Renamed GenericRenderer::length() to GenericRenderer::getLengthMS()
This method now returns non zero values for a workflow.
Corrected ClipRenderer::getCurrentFrame() method.
Commit: 91ffce7714b2df4a817b889a189257cf9e90faca
http://github.com/VLMC/vlmc/commit/91ffce7714b2df4a817b889a189257cf9e90faca
Author: Hugo Beauzee-Luyssen <beauz...@gmail.com>
Date: 2009-11-03 (Tue, 03 Nov 2009)
Changed paths:
M src/GUI/GraphicsMovieItem.cpp
M src/GUI/Import/ImportController.cpp
M src/Media/Media.cpp
M src/Media/Media.h
M src/Metadata/MetaDataWorker.cpp
M src/Renderer/ClipRenderer.cpp
Log Message:
-----------
Renamed Media::getLength to Media::getLengthMS
Commit: 13965beee40407520e5ccaf3f0c0b4b3ab31ee9b
http://github.com/VLMC/vlmc/commit/13965beee40407520e5ccaf3f0c0b4b3ab31ee9b
Author: Hugo Beauzee-Luyssen <beauz...@gmail.com>
Date: 2009-11-03 (Tue, 03 Nov 2009)
Changed paths:
M src/Renderer/ClipRenderer.cpp
M src/Renderer/ClipRenderer.h
M src/Renderer/GenericRenderer.h
M src/Renderer/WorkflowRenderer.cpp
M src/Renderer/WorkflowRenderer.h
Log Message:
-----------
Adding a GenericRenderer::getFps() method
Commit: a0584445ccb916fbccf7919d37f9b249e97e51e6
http://github.com/VLMC/vlmc/commit/a0584445ccb916fbccf7919d37f9b249e97e51e6
Author: Hugo Beauzee-Luyssen <beauz...@gmail.com>
Date: 2009-11-03 (Tue, 03 Nov 2009)
Changed paths:
M src/GUI/TracksScene.cpp
Log Message:
-----------
Fixed crash when removing a clip from the timeline
Commit: 88578d430287cf94b5d478a7213dca71fc45fb2a
http://github.com/VLMC/vlmc/commit/88578d430287cf94b5d478a7213dca71fc45fb2a
Author: Geoffroy Lacarriere <geoffroyl...@gmail.com>
Date: 2009-11-03 (Tue, 03 Nov 2009)
Changed paths:
M src/GUI/ClickableLabel.cpp
M src/GUI/ClickableLabel.h
M src/GUI/ImportMediaListController.cpp
M src/GUI/ImportMediaListController.h
M vlmc.pro
Log Message:
-----------
Add of missing gpl headers
Remove of a deprecated class
Commit: 9b85e0371671f53e5a14ef6184f0fa82cc9ef383
http://github.com/VLMC/vlmc/commit/9b85e0371671f53e5a14ef6184f0fa82cc9ef383
Author: Ludovic Fauvet <e...@l0cal.com>
Date: 2009-11-03 (Tue, 03 Nov 2009)
Changed paths:
M src/GUI/TracksView.cpp
Log Message:
-----------
Fix a crash when removing a clip (closes #55)
Commit: d12f0578e0abc36606664d7b593da31fa18487eb
http://github.com/VLMC/vlmc/commit/d12f0578e0abc36606664d7b593da31fa18487eb
Author: Hugo Beauzee-Luyssen <beauz...@gmail.com>
Date: 2009-11-03 (Tue, 03 Nov 2009)
Changed paths:
M src/Commands/Commands.cpp
M src/Commands/Commands.h
M src/GUI/Timeline.cpp
M src/GUI/Timeline.h
M src/GUI/TracksScene.cpp
M src/GUI/TracksView.cpp
M src/Workflow/MainWorkflow.cpp
M src/Workflow/MainWorkflow.h
M src/Workflow/TrackHandler.cpp
M src/Workflow/TrackHandler.h
M src/Workflow/TrackWorkflow.cpp
M src/Workflow/TrackWorkflow.h
Log Message:
-----------
Moved TrackType enum to MainWorkflow class.
Some modifications should improve compile time a little bit.
Commit: bb7248212c2da3c1b271c61182d722ad8f7294b1
http://github.com/VLMC/vlmc/commit/bb7248212c2da3c1b271c61182d722ad8f7294b1
Author: Hugo Beauzee-Luyssen <beauz...@gmail.com>
Date: 2009-11-03 (Tue, 03 Nov 2009)
Changed paths:
M src/GUI/TracksScene.cpp
M src/GUI/TracksView.cpp
M src/Workflow/MainWorkflow.cpp
M src/Workflow/MainWorkflow.h
M src/Workflow/TrackHandler.cpp
M src/Workflow/TrackWorkflow.cpp
Log Message:
-----------
Renamed MainWorkflow::TrackType values
Commit: dfb3553e39fd3b96db8b6b262201fbf35119191f
http://github.com/VLMC/vlmc/commit/dfb3553e39fd3b96db8b6b262201fbf35119191f
Author: Ludovic Fauvet <e...@l0cal.com>
Date: 2009-11-03 (Tue, 03 Nov 2009)
Changed paths:
M src/GUI/GraphicsCursorItem.cpp
M src/GUI/GraphicsCursorItem.h
M src/GUI/LCDTimecode.cpp
M src/GUI/LCDTimecode.h
Log Message:
-----------
Fix GPL headers
Commit: e7fae8c7bea6893f9c1c0cb5bcca451173d0722d
http://github.com/VLMC/vlmc/commit/e7fae8c7bea6893f9c1c0cb5bcca451173d0722d
Author: Geoffroy Lacarriere <geoffroyl...@gmail.com>
Date: 2009-11-03 (Tue, 03 Nov 2009)
Changed paths:
M src/GUI/Import/ImportController.cpp
M src/GUI/Import/ImportController.h
Log Message:
-----------
[import]: stop the preview when "Ok/Cancel" button are pressed
Commit: dcae24a601124f1c3953b4cf5271fce237a9f232
http://github.com/VLMC/vlmc/commit/dcae24a601124f1c3953b4cf5271fce237a9f232
Author: Hugo Beauzee-Luyssen <beauz...@gmail.com>
Date: 2009-11-03 (Tue, 03 Nov 2009)
Changed paths:
M src/GUI/TracksView.cpp
M src/GUI/TracksView.h
Log Message:
-----------
Removed unused attribute and include
Commit: 88fb4cb020b77bd184ec2725322e871bb1e49d02
http://github.com/VLMC/vlmc/commit/88fb4cb020b77bd184ec2725322e871bb1e49d02
Author: Geoffroy Lacarriere <geoffroyl...@gmail.com>
Date: 2009-11-03 (Tue, 03 Nov 2009)
Changed paths:
M src/GUI/Import.h
R src/GUI/ImportBrowser.cpp
R src/GUI/ImportBrowser.h
R src/GUI/ui/ImportBrowser.ui
Log Message:
-----------
Bug fix of master branch.
Commit: 5b650f22a9ba27abc4284e54166a13351c42e1f3
http://github.com/VLMC/vlmc/commit/5b650f22a9ba27abc4284e54166a13351c42e1f3
Author: Geoffroy Lacarriere <geoffroyl...@gmail.com>
Date: 2009-11-03 (Tue, 03 Nov 2009)
Changed paths:
M src/GUI/Library/MediaLibraryWidget.cpp
M src/GUI/Library/MediaLibraryWidget.h
M src/GUI/Library/MediaListViewController.cpp
M src/GUI/Library/MediaListViewController.h
M src/GUI/MainWindow.cpp
M src/Library/Library.cpp
Log Message:
-----------
Bugfix: junk signal
Selection media cell in Library
Commit: 3e0eb56f6a175a3b28679f811a62c3285736f359
http://github.com/VLMC/vlmc/commit/3e0eb56f6a175a3b28679f811a62c3285736f359
Author: Geoffroy Lacarriere <geoffroyl...@gmail.com>
Date: 2009-11-03 (Tue, 03 Nov 2009)
Changed paths:
A images/audio.png
A images/video.png
M ressources.qrc
M src/Commands/Commands.cpp
M src/Commands/Commands.h
M src/EffectsEngine/MixerEffect.cpp
M src/GUI/ClickableLabel.cpp
M src/GUI/ClickableLabel.h
M src/GUI/GraphicsCursorItem.cpp
M src/GUI/GraphicsCursorItem.h
M src/GUI/GraphicsMovieItem.cpp
M src/GUI/Import/ImportController.cpp
M src/GUI/Import/ImportController.h
M src/GUI/ImportMediaListController.cpp
M src/GUI/ImportMediaListController.h
A src/GUI/LCDTimecode.cpp
A src/GUI/LCDTimecode.h
M src/GUI/MainWindow.cpp
A src/GUI/PreviewRuler.cpp
A src/GUI/PreviewRuler.h
M src/GUI/PreviewWidget.cpp
M src/GUI/PreviewWidget.h
R src/GUI/Slider.cpp
R src/GUI/Slider.h
M src/GUI/Timeline.cpp
M src/GUI/Timeline.h
M src/GUI/TracksScene.cpp
M src/GUI/TracksView.cpp
M src/GUI/ui/PreviewWidget.ui
M src/Media/Media.cpp
M src/Media/Media.h
M src/Metadata/MetaDataWorker.cpp
M src/Renderer/ClipRenderer.cpp
M src/Renderer/ClipRenderer.h
M src/Renderer/GenericRenderer.h
M src/Renderer/WorkflowRenderer.cpp
M src/Renderer/WorkflowRenderer.h
M src/Workflow/MainWorkflow.cpp
M src/Workflow/MainWorkflow.h
M src/Workflow/TrackHandler.cpp
M src/Workflow/TrackHandler.h
M src/Workflow/TrackWorkflow.cpp
M src/Workflow/TrackWorkflow.h
M vlmc.pro
Log Message:
-----------
Merge remote branch 'origin/master' into geoff_import
Conflicts:
src/GUI/MainWindow.cpp
src/GUI/TracksView.cpp
_______________________________________________
vlmc-devel mailing list
vlmc-devel@vlmc.org
http://vlmc.org/mailman/listinfo/vlmc-devel
