[longomatch: 51/51] Merge live capture



commit 28613275cb56f9cb2af818173a62ec54971e5c22
Merge: dd558b1 6077d73
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date:   Sat May 22 01:24:30 2010 +0200

    Merge live capture

 .gitignore                                         |   11 +-
 CesarPlayer/Capturer/CaptureProperties.cs          |   38 +
 CesarPlayer/Capturer/FakeCapturer.cs               |   64 +-
 CesarPlayer/Capturer/GstCameraCapturer.cs          |  138 ++-
 CesarPlayer/Capturer/ICapturer.cs                  |   16 +-
 CesarPlayer/Capturer/LiveSourceTimer.cs            |   87 ++
 CesarPlayer/CesarPlayer.mdp                        |   88 +-
 CesarPlayer/Common/Enum.cs                         |    1 +
 CesarPlayer/Gui/CapturerBin.cs                     |  176 +++-
 CesarPlayer/Makefile.am                            |    2 +
 CesarPlayer/Utils/MediaFile.cs                     |    4 +-
 CesarPlayer/Utils/PreviewMediaFile.cs              |    4 +-
 CesarPlayer/gtk-gui/LongoMatch.Gui.PlayerBin.cs    |   10 +-
 CesarPlayer/gtk-gui/objects.xml                    |   17 +-
 LongoMatch.mds                                     |   11 +-
 LongoMatch/DB/DataBase.cs                          |   21 +-
 LongoMatch/DB/ProjectDescription.cs                |  128 +--
 LongoMatch/Gui/Component/PlayListWidget.cs         |   14 +-
 LongoMatch/Gui/Component/ProjectDetailsWidget.cs   |  151 ++-
 LongoMatch/Gui/Component/ProjectListWidget.cs      |   23 +-
 LongoMatch/Gui/Dialog/NewProjectDialog.cs          |    7 +
 LongoMatch/Gui/Dialog/ProjectSelectionDialog.cs    |    2 +
 LongoMatch/Gui/MainWindow.cs                       |  220 ++--
 LongoMatch/Handlers/EventsManager.cs               |   29 +-
 LongoMatch/LongoMatch.mdp                          |  364 +++---
 LongoMatch/Utils/ProjectUtils.cs                   |    8 +-
 .../LongoMatch.Gui.Component.PlayListWidget.cs     |   12 +-
 ...ongoMatch.Gui.Component.ProjectDetailsWidget.cs |  530 +++++---
 .../LongoMatch.Gui.Component.TimeLineWidget.cs     |    2 +-
 .../gtk-gui/LongoMatch.Gui.Dialog.DrawingTool.cs   |   15 +-
 .../LongoMatch.Gui.Dialog.EditCategoryDialog.cs    |    5 +-
 .../LongoMatch.Gui.Dialog.EditPlayerDialog.cs      |    3 +-
 .../LongoMatch.Gui.Dialog.EndCaptureDialog.cs      |   19 +-
 .../gtk-gui/LongoMatch.Gui.Dialog.EntryDialog.cs   |    1 -
 ...Match.Gui.Dialog.FramesCaptureProgressDialog.cs |    1 -
 .../LongoMatch.Gui.Dialog.HotKeySelectorDialog.cs  |    1 -
 .../gtk-gui/LongoMatch.Gui.Dialog.Migrator.cs      |    1 -
 .../LongoMatch.Gui.Dialog.OpenProjectDialog.cs     |    1 -
 ...LongoMatch.Gui.Dialog.PlayersSelectionDialog.cs |    1 -
 ...LongoMatch.Gui.Dialog.ProjectSelectionDialog.cs |   95 +-
 ...Match.Gui.Dialog.ProjectTemplateEditorDialog.cs |    1 -
 .../LongoMatch.Gui.Dialog.ProjectsManager.cs       |    7 +-
 .../LongoMatch.Gui.Dialog.SnapshotsDialog.cs       |    3 +-
 .../gtk-gui/LongoMatch.Gui.Dialog.TaggerDialog.cs  |    5 +-
 .../LongoMatch.Gui.Dialog.TeamTemplateEditor.cs    |    3 +-
 .../LongoMatch.Gui.Dialog.TemplatesManager.cs      |   23 +-
 .../gtk-gui/LongoMatch.Gui.Dialog.UpdateDialog.cs  |    1 -
 ...LongoMatch.Gui.Dialog.VideoEditionProperties.cs |    3 +-
 .../LongoMatch.Gui.Dialog.Win32CalendarDialog.cs   |    5 +-
 LongoMatch/gtk-gui/LongoMatch.Gui.MainWindow.cs    |   96 +-
 LongoMatch/gtk-gui/gui.stetic                      |  591 ++++++---
 LongoMatch/gtk-gui/objects.xml                     |   54 +-
 libcesarplayer/liblongomatch.mdp                   |   35 +-
 libcesarplayer/src/Makefile.am                     |    5 +-
 libcesarplayer/src/bacon-video-widget-gst-0.10.c   |   60 +-
 libcesarplayer/src/bacon-video-widget.h            |   60 -
 libcesarplayer/src/common.h                        |  104 ++
 libcesarplayer/src/gst-camera-capturer.c           | 1411 ++++++++++++++------
 libcesarplayer/src/gst-camera-capturer.h           |  111 +--
 libcesarplayer/src/gst-video-capturer.c            |  735 ----------
 libcesarplayer/src/gst-video-capturer.h            |   81 --
 libcesarplayer/src/gst-video-editor.c              |   40 +-
 libcesarplayer/src/gst-video-editor.h              |   38 +-
 63 files changed, 3258 insertions(+), 2535 deletions(-)
---



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]