Branch: refs/heads/master
Home:   http://github.com/VLMC/vlmc

Commit: eea04696b669ac3289b30d1085a0afe7e89d1e94
    http://github.com/VLMC/vlmc/commit/eea04696b669ac3289b30d1085a0afe7e89d1e94
Author: Geoffroy Lacarriere <[email protected]>
Date:   2009-11-28 (Sat, 28 Nov 2009)

Changed paths:
  M src/Media/Media.cpp
  M src/Media/Media.h
  M src/Metadata/MetaDataManager.cpp
  M src/Metadata/MetaDataManager.h
  M src/Metadata/MetaDataWorker.cpp
  M src/Metadata/MetaDataWorker.h

Log Message:
-----------
first version of threading the audioSpectrum generation


Commit: 3530774570428f36ab96bb8d353c27ce32aeee68
    http://github.com/VLMC/vlmc/commit/3530774570428f36ab96bb8d353c27ce32aeee68
Author: Geoffroy Lacarriere <[email protected]>
Date:   2009-12-03 (Thu, 03 Dec 2009)

Changed paths:
  M src/Configuration/VLMCSettingsDefault.cpp
  M src/GUI/AbstractGraphicsMediaItem.cpp
  M src/GUI/AbstractGraphicsMediaItem.h
  M src/GUI/GraphicsMovieItem.cpp
  M src/GUI/GraphicsMovieItem.h
  M src/GUI/TracksRuler.cpp
  M src/GUI/TracksView.cpp
  M src/GUI/TracksView.h
  M src/GUI/library/library.pri
  M src/GUI/settings/VLMCPreferences.cpp
  M src/GUI/settings/ui/VLMCPreferences.ui
  M src/Media/Clip.cpp
  M src/Media/Clip.h
  M src/Metadata/MetaDataWorker.cpp
  M src/Renderer/WorkflowFileRenderer.cpp
  M src/Renderer/WorkflowRenderer.cpp
  M src/Workflow/VideoClipWorkflow.cpp

Log Message:
-----------
Merge branch 'master' into geoff_audioSpectrum

Conflicts:
        src/Metadata/MetaDataWorker.cpp


Commit: c739a05ff946cb444dd520a6064af273a2b986a3
    http://github.com/VLMC/vlmc/commit/c739a05ff946cb444dd520a6064af273a2b986a3
Author: Geoffroy Lacarriere <[email protected]>
Date:   2009-12-03 (Thu, 03 Dec 2009)

Changed paths:
  M src/Media/Clip.cpp

Log Message:
-----------
Merge branch 'master' into geoff_audioSpectrum

Conflicts:
        src/Metadata/MetaDataWorker.cpp


Commit: 69ea3b2079a71a9b5a0c4cd1c9ead5bd4fdadf87
    http://github.com/VLMC/vlmc/commit/69ea3b2079a71a9b5a0c4cd1c9ead5bd4fdadf87
Author: Geoffroy Lacarriere <[email protected]>
Date:   2009-12-05 (Sat, 05 Dec 2009)

Changed paths:
  M src/Media/Media.cpp
  M src/Media/Media.h
  M src/Metadata/MetaDataManager.cpp
  M src/Metadata/MetaDataWorker.cpp
  M src/Metadata/MetaDataWorker.h

Log Message:
-----------
Threading of the audio spectrum generation
Working but need a fix (see the comment in the code)


Commit: 324b59125890689fa6362a00c20b112dc1361e50
    http://github.com/VLMC/vlmc/commit/324b59125890689fa6362a00c20b112dc1361e50
Author: Geoffroy Lacarriere <[email protected]>
Date:   2009-12-05 (Sat, 05 Dec 2009)

Changed paths:
  M src/Configuration/ProjectSettingsDefault.cpp
  R src/GUI/FileBrowser.cpp
  R src/GUI/FileBrowser.h
  M src/GUI/GUI.pri
  M src/GUI/GraphicsMovieItem.cpp
  M src/GUI/GraphicsMovieItem.h
  M src/GUI/LanguagePreferences.h
  R src/GUI/LibraryWidget.cpp
  R src/GUI/LibraryWidget.h
  R src/GUI/ListViewMediaItem.cpp
  R src/GUI/ListViewMediaItem.h
  M src/GUI/MainWindow.cpp
  M src/GUI/MainWindow.h
  R src/GUI/MediaListWidget.cpp
  R src/GUI/MediaListWidget.h
  M src/GUI/PreviewWidget.cpp
  M src/GUI/TracksView.cpp
  M src/GUI/UndoStack.cpp
  M src/GUI/UndoStack.h
  A src/GUI/settings/KeyboardShortcutInput.cpp
  A src/GUI/settings/KeyboardShortcutInput.h
  M src/GUI/settings/Panel.cpp
  M src/GUI/settings/Panel.h
  M src/GUI/settings/ProjectPreferences.cpp
  M src/GUI/settings/Settings.cpp
  M src/GUI/settings/Settings.h
  M src/GUI/settings/settings.pri
  M src/GUI/settings/ui/ProjectPreferences.ui
  M src/GUI/ui/MainWindow.ui
  M src/GUI/wizard/ProjectWizard.cpp
  M src/Library/Library.cpp
  M src/Library/Library.h
  M src/Project/ProjectManager.cpp
  M src/Project/ProjectManager.h
  M src/Workflow/ClipWorkflow.cpp
  M src/src.pri
  M ts/vlmc_es.ts
  M ts/vlmc_fr.ts
  M ts/vlmc_sv.ts
  M vlmc.pro

Log Message:
-----------
Merge branch 'master' into geoff_audioSpectrum


Commit: 8cc182e4d488b859992f2c41dc1354dee5a8b41c
    http://github.com/VLMC/vlmc/commit/8cc182e4d488b859992f2c41dc1354dee5a8b41c
Author: Geoffroy Lacarriere <[email protected]>
Date:   2009-12-05 (Sat, 05 Dec 2009)

Changed paths:
  M src/Metadata/MetaDataWorker.cpp
  M src/Metadata/MetaDataWorker.h

Log Message:
-----------
Clean unused code


_______________________________________________
vlmc-devel mailing list
[email protected]
http://vlmc.org/mailman/listinfo/vlmc-devel

Reply via email to