iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Moved files relevant to providers to aegisub/include. A few things might be broken. 

Originally committed to SVN as r1956.
This commit is contained in:
Rodrigo Braz Monteiro 2008-03-07 21:00:20 +00:00
parent 09abd27acf
commit 4f4f4cc91f
56 changed files with 534 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
aegisub/audio_display.h
View File

@ -44,8 +44,8 @@
#include <wx/window.h> #include <wx/window.h>
#include <wx/bitmap.h> #include <wx/bitmap.h>
#include <stdint.h> #include <stdint.h>
#include "audio_provider.h" #include "audio_provider_manager.h"
#include "audio_player.h" #include "audio_player_manager.h"
#include "audio_spectrum.h" #include "audio_spectrum.h"

2
aegisub/audio_player.cpp
View File

@ -37,7 +37,7 @@
/////////// ///////////
// Headers // Headers
#include <wx/wxprec.h> #include <wx/wxprec.h>
#include "audio_player.h" #include "audio_player_manager.h"
#include "options.h" #include "options.h"
#ifdef WITH_ALSA #ifdef WITH_ALSA
#include "audio_player_alsa.h" #include "audio_player_alsa.h"

5
aegisub/audio_player_alsa.h
View File

@ -40,12 +40,11 @@
/////////// ///////////
// Headers // Headers
#include <wx/wxprec.h> #include <wx/wxprec.h>
#include "audio_player.h" #include "include/aegisub/audio_player.h"
#include "audio_provider.h" #include "include/aegisub/audio_provider.h"
#include "utils.h" #include "utils.h"
#include "main.h" #include "main.h"
#include "frame_main.h" #include "frame_main.h"
#include "audio_player.h"
#include <alsa/asoundlib.h> #include <alsa/asoundlib.h>
#include "options.h" #include "options.h"

2
aegisub/audio_player_dsound.cpp
View File

@ -39,8 +39,6 @@
#ifdef WITH_DIRECTSOUND #ifdef WITH_DIRECTSOUND
#include <wx/wxprec.h> #include <wx/wxprec.h>
#include "audio_player.h"
#include "audio_provider.h"
#include "utils.h" #include "utils.h"
#include "main.h" #include "main.h"
#include "frame_main.h" #include "frame_main.h"

5
aegisub/audio_player_dsound.h
View File

@ -39,12 +39,11 @@
#ifdef WITH_DIRECTSOUND #ifdef WITH_DIRECTSOUND
#include <wx/wxprec.h> #include <wx/wxprec.h>
#include "audio_player.h" #include "include/aegisub/audio_player.h"
#include "audio_provider.h" #include "include/aegisub/audio_provider.h"
#include "utils.h" #include "utils.h"
#include "main.h" #include "main.h"
#include "frame_main.h" #include "frame_main.h"
#include "audio_player.h"
#include <mmsystem.h> #include <mmsystem.h>
#include <dsound.h> #include <dsound.h>

70
aegisub/audio_player_manager.h Normal file
View File

@ -0,0 +1,70 @@
// Copyright (c) 2005-2007, Rodrigo Braz Monteiro
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
//
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of the Aegisub Group nor the names of its contributors
// may be used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
// -----------------------------------------------------------------------------
//
// AEGISUB
//
// Website: http://aegisub.cellosoft.com
// Contact: mailto:zeratul@cellosoft.com
//
#pragma once
///////////
// Headers
#include <wx/wxprec.h>
#include <wx/event.h>
#include <wx/timer.h>
#include <wx/thread.h>
#include <stdint.h>
#include "factory_manager.h"
#include "include/aegisub/audio_player.h"
//////////////
// Prototypes
class AudioProvider;
///////////////////
// Factory Manager
class AudioPlayerFactoryManager : public FactoryManager<AudioPlayerFactory> {
public:
static AudioPlayer *GetAudioPlayer();
static void RegisterProviders();
};
/////////
// Event
DECLARE_EVENT_TYPE(wxEVT_STOP_AUDIO, -1)

4
aegisub/audio_player_openal.h
View File

@ -40,8 +40,8 @@
/////////// ///////////
// Headers // Headers
#include <wx/wxprec.h> #include <wx/wxprec.h>
#include "audio_player.h" #include "include/aegisub/audio_player.h"
#include "audio_provider.h" #include "include/aegisub/audio_provider.h"
#include "utils.h" #include "utils.h"
#include "main.h" #include "main.h"
#include "frame_main.h" #include "frame_main.h"

4
aegisub/audio_player_portaudio.h
View File

@ -39,8 +39,8 @@
/////////// ///////////
// Headers // Headers
#include "audio_player.h" #include "include/aegisub/audio_player.h"
#include "audio_provider.h" #include "include/aegisub/audio_provider.h"
#include "utils.h" #include "utils.h"
extern "C" { extern "C" {
#include <portaudio.h> #include <portaudio.h>

4
aegisub/audio_player_pulse.h
View File

@ -41,8 +41,8 @@
// Headers // Headers
#include <wx/wxprec.h> #include <wx/wxprec.h>
#include <stdio.h> #include <stdio.h>
#include "audio_player.h" #include "include/aegisub/audio_player.h"
#include "audio_provider.h" #include "include/aegisub/audio_provider.h"
#include "utils.h" #include "utils.h"
#include "options.h" #include "options.h"
#include <pulse/pulseaudio.h> #include <pulse/pulseaudio.h>

2
aegisub/audio_provider_avs.h
View File

@ -39,7 +39,7 @@
#include <wx/wxprec.h> #include <wx/wxprec.h>
#ifdef WITH_AVISYNTH #ifdef WITH_AVISYNTH
#include <Mmreg.h> #include <Mmreg.h>
#include "audio_provider.h" #include "include/aegisub/audio_provider.h"
#include "avisynth_wrap.h" #include "avisynth_wrap.h"

2
aegisub/audio_provider_convert.h
View File

@ -39,7 +39,7 @@
/////////// ///////////
// Headers // Headers
#include "audio_provider.h" #include "include/aegisub/audio_provider.h"
//////////////////////// ////////////////////////

2
aegisub/audio_provider_dummy.h
View File

@ -39,7 +39,7 @@
/////////// ///////////
// Headers // Headers
#include "audio_provider.h" #include "include/aegisub/audio_provider.h"
//////////////////////// ////////////////////////

2
aegisub/audio_provider_hd.h
View File

@ -39,7 +39,7 @@
/////////// ///////////
// Headers // Headers
#include "audio_provider.h" #include "include/aegisub/audio_provider.h"
#include <wx/file.h> #include <wx/file.h>

2
aegisub/audio_provider_lavc.h
View File

@ -57,7 +57,7 @@ extern "C" {
} }
#include "mkv_wrap.h" #include "mkv_wrap.h"
#include "lavc_file.h" #include "lavc_file.h"
#include "audio_provider.h" #include "include/aegisub/audio_provider.h"
#include "lavc_file.h" #include "lavc_file.h"

54
aegisub/audio_provider_manager.h Normal file
View File

@ -0,0 +1,54 @@
// Copyright (c) 2006, Rodrigo Braz Monteiro
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
//
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of the Aegisub Group nor the names of its contributors
// may be used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
// -----------------------------------------------------------------------------
//
// AEGISUB
//
// Website: http://aegisub.cellosoft.com
// Contact: mailto:zeratul@cellosoft.com
//
#pragma once
///////////
// Headers
#include <wx/wxprec.h>
#include <stdint.h>
#include "factory_manager.h"
#include "include/aegisub/audio_provider.h"
///////////////////
// Factory Manager
class AudioProviderFactoryManager : public FactoryManager<AudioProviderFactory> {
public:
static void RegisterProviders();
static AudioProvider *GetAudioProvider(wxString filename, int cache=-1);
};

2
aegisub/audio_provider_pcm.h
View File

@ -39,7 +39,7 @@
/////////// ///////////
// Headers // Headers
#include "audio_provider.h" #include "include/aegisub/audio_provider.h"
#include <wx/file.h> #include <wx/file.h>
#include <wx/thread.h> #include <wx/thread.h>
#include <vector> #include <vector>

2
aegisub/audio_provider_ram.h
View File

@ -39,7 +39,7 @@
/////////// ///////////
// Headers // Headers
#include "audio_provider.h" #include "include/aegisub/audio_provider.h"
//////////////////////// ////////////////////////

2
aegisub/audio_provider_stream.h
View File

@ -41,7 +41,7 @@
// Headers // Headers
#include <list> #include <list>
#include <vector> #include <vector>
#include "audio_provider.h" #include "include/aegisub/audio_provider.h"
//////////////////////// ////////////////////////

2
aegisub/audio_spectrum.h
View File

@ -39,7 +39,7 @@
#include <wx/wxprec.h> #include <wx/wxprec.h>
#include <stdint.h> #include <stdint.h>
#include "audio_provider.h" #include "audio_provider_manager.h"
// Specified and implemented in cpp file, interface is private to spectrum code // Specified and implemented in cpp file, interface is private to spectrum code

4
aegisub/dialog_options.cpp
View File

@ -55,8 +55,8 @@
#include "subs_grid.h" #include "subs_grid.h"
#include "video_box.h" #include "video_box.h"
#include "video_slider.h" #include "video_slider.h"
#include "video_provider.h" #include "video_provider_manager.h"
#include "subtitles_provider.h" #include "subtitles_provider_manager.h"
#include "audio_box.h" #include "audio_box.h"
#include "audio_display.h" #include "audio_display.h"
#include "video_context.h" #include "video_context.h"

2
aegisub/dialog_properties.cpp
View File

@ -45,7 +45,7 @@
#include "ass_file.h" #include "ass_file.h"
#include "video_display.h" #include "video_display.h"
#include "validators.h" #include "validators.h"
#include "video_provider.h" #include "video_provider_manager.h"
#include "utils.h" #include "utils.h"
#include "help_button.h" #include "help_button.h"

2
aegisub/dialog_spellchecker.cpp
View File

@ -37,7 +37,7 @@
// Headers // Headers
#include <wx/intl.h> #include <wx/intl.h>
#include "dialog_spellchecker.h" #include "dialog_spellchecker.h"
#include "spellchecker.h" #include "spellchecker_manager.h"
#include "subs_grid.h" #include "subs_grid.h"
#include "frame_main.h" #include "frame_main.h"
#include "ass_file.h" #include "ass_file.h"

2
aegisub/dialog_style_editor.cpp
View File

@ -51,7 +51,7 @@
#include "colour_button.h" #include "colour_button.h"
#include "subs_preview.h" #include "subs_preview.h"
#include "options.h" #include "options.h"
#include "subtitles_provider.h" #include "subtitles_provider_manager.h"
#include "ass_style_storage.h" #include "ass_style_storage.h"
#include "help_button.h" #include "help_button.h"

4
aegisub/dialog_video_details.cpp
View File

@ -38,8 +38,8 @@
// Headers // Headers
#include "dialog_video_details.h" #include "dialog_video_details.h"
#include "video_context.h" #include "video_context.h"
#include "video_provider.h" #include "video_provider_manager.h"
#include "audio_provider.h" #include "audio_provider_manager.h"
#include "audio_box.h" #include "audio_box.h"
#include "utils.h" #include "utils.h"

2
aegisub/frame_main.cpp
View File

@ -50,7 +50,7 @@
#include "avisynth_wrap.h" #include "avisynth_wrap.h"
#endif #endif
#include "video_display.h" #include "video_display.h"
#include "video_provider.h" #include "video_provider_manager.h"
#include "video_slider.h" #include "video_slider.h"
#include "ass_file.h" #include "ass_file.h"
#include "dialog_search_replace.h" #include "dialog_search_replace.h"

60
aegisub/include/aegisub/aegisub.h Normal file
View File

@ -0,0 +1,60 @@
// Copyright (c) 2008, Rodrigo Braz Monteiro
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
//
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of the Aegisub Group nor the names of its contributors
// may be used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
// -----------------------------------------------------------------------------
//
// AEGISUB
//
// Website: http://aegisub.cellosoft.com
// Contact: mailto:zeratul@cellosoft.com
//
#pragma once
///////////////
// STL Headers
#include <vector>
#include <string>
#include <stdint.h>
////////////////////////////////
// Define types used by Aegisub
namespace Aegisub {
// String type
typedef std::basic_string<wchar_t> String;
// String array
typedef std::vector<String> StringArray;
};
///////////////////
// Aegisub headers
//#include "video_frame.h"

20
aegisub/audio_player.h → aegisub/include/aegisub/audio_player.h
View File

@ -43,8 +43,7 @@
#include <wx/event.h> #include <wx/event.h>
#include <wx/timer.h> #include <wx/timer.h>
#include <wx/thread.h> #include <wx/thread.h>
#include <stdint.h> #include "aegisub.h"
#include "factory_manager.h"
////////////// //////////////
@ -100,20 +99,3 @@ class AudioPlayerFactory {
public: public:
virtual AudioPlayer *CreatePlayer()=0; virtual AudioPlayer *CreatePlayer()=0;
}; };
///////////////////
// Factory Manager
class AudioPlayerFactoryManager : public FactoryManager<AudioPlayerFactory> {
public:
static AudioPlayer *GetAudioPlayer();
static void RegisterProviders();
};
/////////
// Event
DECLARE_EVENT_TYPE(wxEVT_STOP_AUDIO, -1)

14
aegisub/audio_provider.h → aegisub/include/aegisub/audio_provider.h
View File

@ -39,14 +39,11 @@
/////////// ///////////
// Headers // Headers
#include <wx/wxprec.h> #include "aegisub.h"
#include <stdint.h>
#include "factory_manager.h"
////////////// //////////////
// Prototypes // Prototypes
class AudioDisplay;
class VideoProvider; class VideoProvider;
@ -88,12 +85,3 @@ class AudioProviderFactory {
public: public:
virtual AudioProvider *CreateProvider(wxString filename)=0; virtual AudioProvider *CreateProvider(wxString filename)=0;
}; };
///////////////////
// Factory Manager
class AudioProviderFactoryManager : public FactoryManager<AudioProviderFactory> {
public:
static void RegisterProviders();
static AudioProvider *GetAudioProvider(wxString filename, int cache=-1);
};

12
aegisub/spellchecker.h → aegisub/include/aegisub/spellchecker.h
View File

@ -39,8 +39,7 @@
/////////// ///////////
// Headers // Headers
#include <wx/wxprec.h> #include "aegisub.h"
#include "factory_manager.h"
/////////////////////////// ///////////////////////////
@ -67,12 +66,3 @@ class SpellCheckerFactory {
public: public:
virtual SpellChecker *CreateSpellChecker()=0; virtual SpellChecker *CreateSpellChecker()=0;
}; };
///////////////////
// Factory Manager
class SpellCheckerFactoryManager : public FactoryManager<SpellCheckerFactory> {
public:
static SpellChecker *GetSpellChecker();
static void RegisterProviders();
};

14
aegisub/subtitles_provider.h → aegisub/include/aegisub/subtitles_provider.h
View File

@ -39,9 +39,8 @@
/////////// ///////////
// Headers // Headers
#include <wx/wxprec.h> #include "aegisub.h"
#include "video_frame.h" #include "video_frame.h"
#include "factory_manager.h"
////////////// //////////////
@ -70,14 +69,3 @@ public:
virtual ~SubtitlesProviderFactory() {} virtual ~SubtitlesProviderFactory() {}
virtual SubtitlesProvider *CreateProvider(wxString subType=_T(""))=0; virtual SubtitlesProvider *CreateProvider(wxString subType=_T(""))=0;
}; };
///////////////////
// Factory Manager
class SubtitlesProviderFactoryManager : public FactoryManager<SubtitlesProviderFactory> {
public:
static SubtitlesProvider *GetProvider();
static void RegisterProviders();
static bool ProviderAvailable();
};

12
aegisub/video_provider.h → aegisub/include/aegisub/video_provider.h
View File

@ -39,9 +39,8 @@
////////// //////////
// Headers // Headers
#include <wx/intl.h>
#include "video_frame.h" #include "video_frame.h"
#include "factory_manager.h" #include "aegisub.h"
////////////// //////////////
@ -90,12 +89,3 @@ class VideoProviderFactory {
public: public:
virtual VideoProvider *CreateProvider(wxString video,double fps=0.0)=0; virtual VideoProvider *CreateProvider(wxString video,double fps=0.0)=0;
}; };
///////////////////
// Factory Manager
class VideoProviderFactoryManager : public FactoryManager<VideoProviderFactory> {
public:
static void RegisterProviders();
static VideoProvider *GetProvider(wxString video,double fps=0.0);
};

10
aegisub/plugin_manager.cpp
View File

@ -37,11 +37,11 @@
/////////// ///////////
// Headers // Headers
#include "plugin_manager.h" #include "plugin_manager.h"
#include "video_provider.h" #include "video_provider_manager.h"
#include "audio_provider.h" #include "audio_provider_manager.h"
#include "audio_player.h" #include "audio_player_manager.h"
#include "subtitles_provider.h" #include "subtitles_provider_manager.h"
#include "spellchecker.h" #include "spellchecker_manager.h"
/////////////// ///////////////

2
aegisub/spellchecker.cpp
View File

@ -36,7 +36,7 @@
/////////// ///////////
// Headers // Headers
#include "spellchecker.h" #include "spellchecker_manager.h"
#ifdef WITH_HUNSPELL #ifdef WITH_HUNSPELL
#include "spellchecker_hunspell.h" #include "spellchecker_hunspell.h"
#endif #endif

2
aegisub/spellchecker_hunspell.h
View File

@ -39,7 +39,7 @@
#ifdef WITH_HUNSPELL #ifdef WITH_HUNSPELL
#include "spellchecker.h" #include "include/aegisub/spellchecker.h"
#include <hunspell/hunspell.hxx> #include <hunspell/hunspell.hxx>
#include <wx/wxprec.h> #include <wx/wxprec.h>

53
aegisub/spellchecker_manager.h Normal file
View File

@ -0,0 +1,53 @@
// Copyright (c) 2006, Rodrigo Braz Monteiro
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
//
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of the Aegisub Group nor the names of its contributors
// may be used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
// -----------------------------------------------------------------------------
//
// AEGISUB
//
// Website: http://aegisub.cellosoft.com
// Contact: mailto:zeratul@cellosoft.com
//
#pragma once
///////////
// Headers
#include <wx/wxprec.h>
#include "factory_manager.h"
#include "include/aegisub/spellchecker.h"
///////////////////
// Factory Manager
class SpellCheckerFactoryManager : public FactoryManager<SpellCheckerFactory> {
public:
static SpellChecker *GetSpellChecker();
static void RegisterProviders();
};

2
aegisub/subs_edit_ctrl.h
View File

@ -40,7 +40,7 @@
//////////// ////////////
// Includes // Includes
#include <wx/wxprec.h> #include <wx/wxprec.h>
#include "spellchecker.h" #include "spellchecker_manager.h"
#include "thesaurus.h" #include "thesaurus.h"
#include "scintilla_text_ctrl.h" #include "scintilla_text_ctrl.h"

2
aegisub/subs_grid.h
View File

@ -45,7 +45,7 @@
#include <list> #include <list>
#include "base_grid.h" #include "base_grid.h"
#include "audio_display.h" #include "audio_display.h"
#include "audio_provider.h" #include "audio_provider_manager.h"
#include "audio_box.h" #include "audio_box.h"
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>

2
aegisub/subs_preview.cpp
View File

@ -42,7 +42,7 @@
#include "ass_style.h" #include "ass_style.h"
#include "subs_preview.h" #include "subs_preview.h"
#include "video_provider_dummy.h" #include "video_provider_dummy.h"
#include "subtitles_provider.h" #include "subtitles_provider_manager.h"
#include "ass_file.h" #include "ass_file.h"

2
aegisub/subtitle_format_dvd.cpp
View File

@ -41,7 +41,7 @@
// Headers // Headers
#include "subtitle_format_dvd.h" #include "subtitle_format_dvd.h"
#include "video_provider_dummy.h" #include "video_provider_dummy.h"
#include "subtitles_provider.h" #include "subtitles_provider_manager.h"
#include "ass_dialogue.h" #include "ass_dialogue.h"
#include "ass_file.h" #include "ass_file.h"
#ifdef _OPENMP #ifdef _OPENMP

2
aegisub/subtitles_provider.cpp
View File

@ -36,7 +36,7 @@
/////////// ///////////
// Headers // Headers
#include "subtitles_provider.h" #include "subtitles_provider_manager.h"
#ifdef WITH_CSRI #ifdef WITH_CSRI
#include "subtitles_provider_csri.h" #include "subtitles_provider_csri.h"
#endif #endif

2
aegisub/subtitles_provider_csri.h
View File

@ -40,7 +40,7 @@
#ifdef WITH_CSRI #ifdef WITH_CSRI
#include <wx/wxprec.h> #include <wx/wxprec.h>
#include "subtitles_provider.h" #include "include/aegisub/subtitles_provider.h"
#ifdef WIN32 #ifdef WIN32
#define CSRIAPI #define CSRIAPI
#endif #endif

56
aegisub/subtitles_provider_manager.h Normal file
View File

@ -0,0 +1,56 @@
// Copyright (c) 2007, Rodrigo Braz Monteiro
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
//
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of the Aegisub Group nor the names of its contributors
// may be used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
// -----------------------------------------------------------------------------
//
// AEGISUB
//
// Website: http://aegisub.cellosoft.com
// Contact: mailto:zeratul@cellosoft.com
//
#pragma once
///////////
// Headers
#include <wx/wxprec.h>
#include "include/aegisub/subtitles_provider.h"
#include "video_frame.h"
#include "factory_manager.h"
///////////////////
// Factory Manager
class SubtitlesProviderFactoryManager : public FactoryManager<SubtitlesProviderFactory> {
public:
static SubtitlesProvider *GetProvider();
static void RegisterProviders();
static bool ProviderAvailable();
};

2
aegisub/video_box.cpp
View File

@ -49,7 +49,7 @@
#include "toggle_bitmap.h" #include "toggle_bitmap.h"
#include "options.h" #include "options.h"
#include "subs_grid.h" #include "subs_grid.h"
#include "video_provider.h" #include "video_provider_manager.h"
#include "ass_file.h" #include "ass_file.h"
#include "ass_dialogue.h" #include "ass_dialogue.h"
#include "vfr.h" #include "vfr.h"

4
aegisub/video_context.cpp
View File

@ -51,9 +51,9 @@
#include "utils.h" #include "utils.h"
#include "video_display.h" #include "video_display.h"
#include "video_context.h" #include "video_context.h"
#include "video_provider.h" #include "video_provider_manager.h"
#include "visual_tool.h" #include "visual_tool.h"
#include "subtitles_provider.h" #include "subtitles_provider_manager.h"
#include "vfr.h" #include "vfr.h"
#include "ass_file.h" #include "ass_file.h"
#include "ass_exporter.h" #include "ass_exporter.h"

2
aegisub/video_display.cpp
View File

@ -51,7 +51,7 @@
#include <wx/config.h> #include <wx/config.h>
#include "utils.h" #include "utils.h"
#include "video_display.h" #include "video_display.h"
#include "video_provider.h" #include "video_provider_manager.h"
#include "vfr.h" #include "vfr.h"
#include "ass_file.h" #include "ass_file.h"
#include "ass_time.h" #include "ass_time.h"

4
aegisub/video_provider_avs.h
View File

@ -39,8 +39,8 @@
#include <wx/wxprec.h> #include <wx/wxprec.h>
#ifdef WITH_AVISYNTH #ifdef WITH_AVISYNTH
#include "avisynth_wrap.h" #include "avisynth_wrap.h"
#include "video_provider.h" #include "include/aegisub/video_provider.h"
#include "subtitles_provider.h" #include "include/aegisub/subtitles_provider.h"
//////////// ////////////

2
aegisub/video_provider_cache.h
View File

@ -40,7 +40,7 @@
////////// //////////
// Headers // Headers
#include <list> #include <list>
#include "video_provider.h" #include "include/aegisub/video_provider.h"
//////////////// ////////////////

2
aegisub/video_provider_dshow.h
View File

@ -50,7 +50,7 @@
#include <windows.h> #include <windows.h>
#include <tchar.h> #include <tchar.h>
#include <initguid.h> #include <initguid.h>
#include "video_provider.h" #include "include/aegisub/video_provider.h"
#include "videosink.h" #include "videosink.h"

2
aegisub/video_provider_dummy.h
View File

@ -41,7 +41,7 @@
/////////// ///////////
// Headers // Headers
#include "video_provider.h" #include "include/aegisub/video_provider.h"
#include <wx/colour.h> #include <wx/colour.h>

2
aegisub/video_provider_lavc.h
View File

@ -47,7 +47,7 @@ extern "C" {
#include <ffmpeg/avformat.h> #include <ffmpeg/avformat.h>
#include <ffmpeg/swscale.h> #include <ffmpeg/swscale.h>
} }
#include "video_provider.h" #include "include/aegisub/video_provider.h"
#include "mkv_wrap.h" #include "mkv_wrap.h"
#include "lavc_file.h" #include "lavc_file.h"

2
aegisub/video_provider.cpp → aegisub/video_provider_manager.cpp
View File

@ -36,7 +36,7 @@
/////////// ///////////
// Headers // Headers
#include "video_provider.h" #include "video_provider_manager.h"
#include "video_provider_dummy.h" #include "video_provider_dummy.h"
#include "options.h" #include "options.h"
#include "vfr.h" #include "vfr.h"

54
aegisub/video_provider_manager.h Normal file
View File

@ -0,0 +1,54 @@
// Copyright (c) 2006-2008, Rodrigo Braz Monteiro, Fredrik Mellbin
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
//
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of the Aegisub Group nor the names of its contributors
// may be used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
// -----------------------------------------------------------------------------
//
// AEGISUB
//
// Website: http://aegisub.cellosoft.com
// Contact: mailto:zeratul@cellosoft.com
//
#pragma once
//////////
// Headers
#include <wx/intl.h>
#include "include/aegisub/video_provider.h"
#include "video_frame.h"
#include "factory_manager.h"
///////////////////
// Factory Manager
class VideoProviderFactoryManager : public FactoryManager<VideoProviderFactory> {
public:
static void RegisterProviders();
static VideoProvider *GetProvider(wxString video,double fps=0.0);
};

2
aegisub/visual_tool.cpp
View File

@ -45,7 +45,7 @@
#include <wx/wxprec.h> #include <wx/wxprec.h>
#include "visual_tool.h" #include "visual_tool.h"
#include "video_display.h" #include "video_display.h"
#include "video_provider.h" #include "video_provider_manager.h"
#include "vfr.h" #include "vfr.h"
#include "ass_file.h" #include "ass_file.h"
#include "ass_time.h" #include "ass_time.h"

78
build/aegisub_vs2008/aegisub_vs2008.vcproj
View File

@ -56,7 +56,7 @@
WarningLevel="3" WarningLevel="3"
WarnAsError="true" WarnAsError="true"
Detect64BitPortabilityProblems="false" Detect64BitPortabilityProblems="false"
DebugInformationFormat="4" DebugInformationFormat="3"
DisableSpecificWarnings="4267" DisableSpecificWarnings="4267"
ForcedIncludeFiles="stdwx.h;config.h" ForcedIncludeFiles="stdwx.h;config.h"
/> />
@ -489,10 +489,6 @@
RelativePath="..\..\aegisub\audio_player.cpp" RelativePath="..\..\aegisub\audio_player.cpp"
> >
</File> </File>
<File
RelativePath="..\..\aegisub\audio_player.h"
>
</File>
<File <File
RelativePath="..\..\aegisub\audio_player_alsa.cpp" RelativePath="..\..\aegisub\audio_player_alsa.cpp"
> >
@ -509,6 +505,10 @@
RelativePath="..\..\aegisub\audio_player_dsound.h" RelativePath="..\..\aegisub\audio_player_dsound.h"
> >
</File> </File>
<File
RelativePath="..\..\aegisub\audio_player_manager.h"
>
</File>
<File <File
RelativePath="..\..\aegisub\audio_player_openal.cpp" RelativePath="..\..\aegisub\audio_player_openal.cpp"
> >
@ -537,10 +537,6 @@
RelativePath="..\..\aegisub\audio_provider.cpp" RelativePath="..\..\aegisub\audio_provider.cpp"
> >
</File> </File>
<File
RelativePath="..\..\aegisub\audio_provider.h"
>
</File>
<File <File
RelativePath="..\..\aegisub\audio_provider_avs.cpp" RelativePath="..\..\aegisub\audio_provider_avs.cpp"
> >
@ -581,6 +577,10 @@
RelativePath="..\..\aegisub\audio_provider_lavc.h" RelativePath="..\..\aegisub\audio_provider_lavc.h"
> >
</File> </File>
<File
RelativePath="..\..\aegisub\audio_provider_manager.h"
>
</File>
<File <File
RelativePath="..\..\aegisub\audio_provider_pcm.cpp" RelativePath="..\..\aegisub\audio_provider_pcm.cpp"
> >
@ -1593,14 +1593,6 @@
RelativePath="..\..\aegisub\video_frame.h" RelativePath="..\..\aegisub\video_frame.h"
> >
</File> </File>
<File
RelativePath="..\..\aegisub\video_provider.cpp"
>
</File>
<File
RelativePath="..\..\aegisub\video_provider.h"
>
</File>
<File <File
RelativePath="..\..\aegisub\video_provider_avs.cpp" RelativePath="..\..\aegisub\video_provider_avs.cpp"
> >
@ -1641,6 +1633,14 @@
RelativePath="..\..\aegisub\video_provider_lavc.h" RelativePath="..\..\aegisub\video_provider_lavc.h"
> >
</File> </File>
<File
RelativePath="..\..\aegisub\video_provider_manager.cpp"
>
</File>
<File
RelativePath="..\..\aegisub\video_provider_manager.h"
>
</File>
<File <File
RelativePath="..\..\aegisub\video_slider.cpp" RelativePath="..\..\aegisub\video_slider.cpp"
> >
@ -1657,10 +1657,6 @@
RelativePath="..\..\aegisub\spellchecker.cpp" RelativePath="..\..\aegisub\spellchecker.cpp"
> >
</File> </File>
<File
RelativePath="..\..\aegisub\spellchecker.h"
>
</File>
<File <File
RelativePath="..\..\aegisub\spellchecker_hunspell.cpp" RelativePath="..\..\aegisub\spellchecker_hunspell.cpp"
> >
@ -1669,6 +1665,10 @@
RelativePath="..\..\aegisub\spellchecker_hunspell.h" RelativePath="..\..\aegisub\spellchecker_hunspell.h"
> >
</File> </File>
<File
RelativePath="..\..\aegisub\spellchecker_manager.h"
>
</File>
<File <File
RelativePath="..\..\aegisub\thesaurus.cpp" RelativePath="..\..\aegisub\thesaurus.cpp"
> >
@ -1777,10 +1777,6 @@
RelativePath="..\..\aegisub\subtitles_provider.cpp" RelativePath="..\..\aegisub\subtitles_provider.cpp"
> >
</File> </File>
<File
RelativePath="..\..\aegisub\subtitles_provider.h"
>
</File>
<File <File
RelativePath="..\..\aegisub\subtitles_provider_csri.cpp" RelativePath="..\..\aegisub\subtitles_provider_csri.cpp"
> >
@ -1797,6 +1793,10 @@
RelativePath="..\..\aegisub\subtitles_provider_libass.h" RelativePath="..\..\aegisub\subtitles_provider_libass.h"
> >
</File> </File>
<File
RelativePath="..\..\aegisub\subtitles_provider_manager.h"
>
</File>
</Filter> </Filter>
<Filter <Filter
Name="Visual Tools" Name="Visual Tools"
@ -1902,6 +1902,34 @@
</File> </File>
</Filter> </Filter>
</Filter> </Filter>
<Filter
Name="Include"
>
<File
RelativePath="..\..\aegisub\include\aegisub\aegisub.h"
>
</File>
<File
RelativePath="..\..\aegisub\include\aegisub\audio_player.h"
>
</File>
<File
RelativePath="..\..\aegisub\include\aegisub\audio_provider.h"
>
</File>
<File
RelativePath="..\..\aegisub\include\aegisub\spellchecker.h"
>
</File>
<File
RelativePath="..\..\aegisub\include\aegisub\subtitles_provider.h"
>
</File>
<File
RelativePath="..\..\aegisub\include\aegisub\video_provider.h"
>
</File>
</Filter>
<File <File
RelativePath="..\..\aegisub\changelog.txt" RelativePath="..\..\aegisub\changelog.txt"
> >

73
vsfilter/vsfilter_2008.sln
View File

@ -7,6 +7,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vsfilter_2008", "vsfilter_2
{5F6E4984-0E0A-468D-8EF5-AE52AE8CBBF6} = {5F6E4984-0E0A-468D-8EF5-AE52AE8CBBF6} {5F6E4984-0E0A-468D-8EF5-AE52AE8CBBF6} = {5F6E4984-0E0A-468D-8EF5-AE52AE8CBBF6}
{6BB08A9D-BBD3-433A-A6D9-079C84EBE270} = {6BB08A9D-BBD3-433A-A6D9-079C84EBE270} {6BB08A9D-BBD3-433A-A6D9-079C84EBE270} = {6BB08A9D-BBD3-433A-A6D9-079C84EBE270}
{B0CD35D2-65C8-48D0-BEC8-D235137F62F6} = {B0CD35D2-65C8-48D0-BEC8-D235137F62F6} {B0CD35D2-65C8-48D0-BEC8-D235137F62F6} = {B0CD35D2-65C8-48D0-BEC8-D235137F62F6}
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basevideofilter_2008", "basevideofilter\basevideofilter_2008.vcproj", "{B0CD35D2-65C8-48D0-BEC8-D235137F62F6}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basevideofilter_2008", "basevideofilter\basevideofilter_2008.vcproj", "{B0CD35D2-65C8-48D0-BEC8-D235137F62F6}"
@ -23,36 +24,108 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "subtitles_2008", "subtitles
{971851AB-A612-4F2F-866F-F0FA152EFFB2} = {971851AB-A612-4F2F-866F-F0FA152EFFB2} {971851AB-A612-4F2F-866F-F0FA152EFFB2} = {971851AB-A612-4F2F-866F-F0FA152EFFB2}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "baseclasses", "C:\Program Files (x86)\Microsoft Platform SDK for Windows Server 2003 R2\Samples\Multimedia\DirectShow\BaseClasses\baseclasses.vcproj", "{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug_MBCS|Win32 = Debug_MBCS|Win32
Debug_MBCS|x64 = Debug_MBCS|x64
Debug|Win32 = Debug|Win32 Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release_MBCS|Win32 = Release_MBCS|Win32
Release_MBCS|x64 = Release_MBCS|x64
Release|Win32 = Release|Win32 Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{7A3950FD-A235-459A-ACA2-5170863CD32C}.Debug_MBCS|Win32.ActiveCfg = Debug|Win32
{7A3950FD-A235-459A-ACA2-5170863CD32C}.Debug_MBCS|Win32.Build.0 = Debug|Win32
{7A3950FD-A235-459A-ACA2-5170863CD32C}.Debug_MBCS|x64.ActiveCfg = Debug|Win32
{7A3950FD-A235-459A-ACA2-5170863CD32C}.Debug|Win32.ActiveCfg = Debug|Win32 {7A3950FD-A235-459A-ACA2-5170863CD32C}.Debug|Win32.ActiveCfg = Debug|Win32
{7A3950FD-A235-459A-ACA2-5170863CD32C}.Debug|Win32.Build.0 = Debug|Win32 {7A3950FD-A235-459A-ACA2-5170863CD32C}.Debug|Win32.Build.0 = Debug|Win32
{7A3950FD-A235-459A-ACA2-5170863CD32C}.Debug|x64.ActiveCfg = Debug|Win32
{7A3950FD-A235-459A-ACA2-5170863CD32C}.Release_MBCS|Win32.ActiveCfg = Release|Win32
{7A3950FD-A235-459A-ACA2-5170863CD32C}.Release_MBCS|Win32.Build.0 = Release|Win32
{7A3950FD-A235-459A-ACA2-5170863CD32C}.Release_MBCS|x64.ActiveCfg = Release|Win32
{7A3950FD-A235-459A-ACA2-5170863CD32C}.Release|Win32.ActiveCfg = Release|Win32 {7A3950FD-A235-459A-ACA2-5170863CD32C}.Release|Win32.ActiveCfg = Release|Win32
{7A3950FD-A235-459A-ACA2-5170863CD32C}.Release|Win32.Build.0 = Release|Win32 {7A3950FD-A235-459A-ACA2-5170863CD32C}.Release|Win32.Build.0 = Release|Win32
{7A3950FD-A235-459A-ACA2-5170863CD32C}.Release|x64.ActiveCfg = Release|Win32
{B0CD35D2-65C8-48D0-BEC8-D235137F62F6}.Debug_MBCS|Win32.ActiveCfg = Debug|Win32
{B0CD35D2-65C8-48D0-BEC8-D235137F62F6}.Debug_MBCS|Win32.Build.0 = Debug|Win32
{B0CD35D2-65C8-48D0-BEC8-D235137F62F6}.Debug_MBCS|x64.ActiveCfg = Debug|Win32
{B0CD35D2-65C8-48D0-BEC8-D235137F62F6}.Debug|Win32.ActiveCfg = Debug|Win32 {B0CD35D2-65C8-48D0-BEC8-D235137F62F6}.Debug|Win32.ActiveCfg = Debug|Win32
{B0CD35D2-65C8-48D0-BEC8-D235137F62F6}.Debug|Win32.Build.0 = Debug|Win32 {B0CD35D2-65C8-48D0-BEC8-D235137F62F6}.Debug|Win32.Build.0 = Debug|Win32
{B0CD35D2-65C8-48D0-BEC8-D235137F62F6}.Debug|x64.ActiveCfg = Debug|Win32
{B0CD35D2-65C8-48D0-BEC8-D235137F62F6}.Release_MBCS|Win32.ActiveCfg = Release|Win32
{B0CD35D2-65C8-48D0-BEC8-D235137F62F6}.Release_MBCS|Win32.Build.0 = Release|Win32
{B0CD35D2-65C8-48D0-BEC8-D235137F62F6}.Release_MBCS|x64.ActiveCfg = Release|Win32
{B0CD35D2-65C8-48D0-BEC8-D235137F62F6}.Release|Win32.ActiveCfg = Release|Win32 {B0CD35D2-65C8-48D0-BEC8-D235137F62F6}.Release|Win32.ActiveCfg = Release|Win32
{B0CD35D2-65C8-48D0-BEC8-D235137F62F6}.Release|Win32.Build.0 = Release|Win32 {B0CD35D2-65C8-48D0-BEC8-D235137F62F6}.Release|Win32.Build.0 = Release|Win32
{B0CD35D2-65C8-48D0-BEC8-D235137F62F6}.Release|x64.ActiveCfg = Release|Win32
{5F6E4984-0E0A-468D-8EF5-AE52AE8CBBF6}.Debug_MBCS|Win32.ActiveCfg = Debug|Win32
{5F6E4984-0E0A-468D-8EF5-AE52AE8CBBF6}.Debug_MBCS|Win32.Build.0 = Debug|Win32
{5F6E4984-0E0A-468D-8EF5-AE52AE8CBBF6}.Debug_MBCS|x64.ActiveCfg = Debug|Win32
{5F6E4984-0E0A-468D-8EF5-AE52AE8CBBF6}.Debug|Win32.ActiveCfg = Debug|Win32 {5F6E4984-0E0A-468D-8EF5-AE52AE8CBBF6}.Debug|Win32.ActiveCfg = Debug|Win32
{5F6E4984-0E0A-468D-8EF5-AE52AE8CBBF6}.Debug|Win32.Build.0 = Debug|Win32 {5F6E4984-0E0A-468D-8EF5-AE52AE8CBBF6}.Debug|Win32.Build.0 = Debug|Win32
{5F6E4984-0E0A-468D-8EF5-AE52AE8CBBF6}.Debug|x64.ActiveCfg = Debug|Win32
{5F6E4984-0E0A-468D-8EF5-AE52AE8CBBF6}.Release_MBCS|Win32.ActiveCfg = Release|Win32
{5F6E4984-0E0A-468D-8EF5-AE52AE8CBBF6}.Release_MBCS|Win32.Build.0 = Release|Win32
{5F6E4984-0E0A-468D-8EF5-AE52AE8CBBF6}.Release_MBCS|x64.ActiveCfg = Release|Win32
{5F6E4984-0E0A-468D-8EF5-AE52AE8CBBF6}.Release|Win32.ActiveCfg = Release|Win32 {5F6E4984-0E0A-468D-8EF5-AE52AE8CBBF6}.Release|Win32.ActiveCfg = Release|Win32
{5F6E4984-0E0A-468D-8EF5-AE52AE8CBBF6}.Release|Win32.Build.0 = Release|Win32 {5F6E4984-0E0A-468D-8EF5-AE52AE8CBBF6}.Release|Win32.Build.0 = Release|Win32
{5F6E4984-0E0A-468D-8EF5-AE52AE8CBBF6}.Release|x64.ActiveCfg = Release|Win32
{971851AB-A612-4F2F-866F-F0FA152EFFB2}.Debug_MBCS|Win32.ActiveCfg = Debug|Win32
{971851AB-A612-4F2F-866F-F0FA152EFFB2}.Debug_MBCS|Win32.Build.0 = Debug|Win32
{971851AB-A612-4F2F-866F-F0FA152EFFB2}.Debug_MBCS|x64.ActiveCfg = Debug|Win32
{971851AB-A612-4F2F-866F-F0FA152EFFB2}.Debug|Win32.ActiveCfg = Debug|Win32 {971851AB-A612-4F2F-866F-F0FA152EFFB2}.Debug|Win32.ActiveCfg = Debug|Win32
{971851AB-A612-4F2F-866F-F0FA152EFFB2}.Debug|Win32.Build.0 = Debug|Win32 {971851AB-A612-4F2F-866F-F0FA152EFFB2}.Debug|Win32.Build.0 = Debug|Win32
{971851AB-A612-4F2F-866F-F0FA152EFFB2}.Debug|x64.ActiveCfg = Debug|Win32
{971851AB-A612-4F2F-866F-F0FA152EFFB2}.Release_MBCS|Win32.ActiveCfg = Release|Win32
{971851AB-A612-4F2F-866F-F0FA152EFFB2}.Release_MBCS|Win32.Build.0 = Release|Win32
{971851AB-A612-4F2F-866F-F0FA152EFFB2}.Release_MBCS|x64.ActiveCfg = Release|Win32
{971851AB-A612-4F2F-866F-F0FA152EFFB2}.Release|Win32.ActiveCfg = Release|Win32 {971851AB-A612-4F2F-866F-F0FA152EFFB2}.Release|Win32.ActiveCfg = Release|Win32
{971851AB-A612-4F2F-866F-F0FA152EFFB2}.Release|Win32.Build.0 = Release|Win32 {971851AB-A612-4F2F-866F-F0FA152EFFB2}.Release|Win32.Build.0 = Release|Win32
{971851AB-A612-4F2F-866F-F0FA152EFFB2}.Release|x64.ActiveCfg = Release|Win32
{11B20554-2747-469C-9093-3345B1D99E0C}.Debug_MBCS|Win32.ActiveCfg = Debug|Win32
{11B20554-2747-469C-9093-3345B1D99E0C}.Debug_MBCS|Win32.Build.0 = Debug|Win32
{11B20554-2747-469C-9093-3345B1D99E0C}.Debug_MBCS|x64.ActiveCfg = Debug|Win32
{11B20554-2747-469C-9093-3345B1D99E0C}.Debug|Win32.ActiveCfg = Debug|Win32 {11B20554-2747-469C-9093-3345B1D99E0C}.Debug|Win32.ActiveCfg = Debug|Win32
{11B20554-2747-469C-9093-3345B1D99E0C}.Debug|Win32.Build.0 = Debug|Win32 {11B20554-2747-469C-9093-3345B1D99E0C}.Debug|Win32.Build.0 = Debug|Win32
{11B20554-2747-469C-9093-3345B1D99E0C}.Debug|x64.ActiveCfg = Debug|Win32
{11B20554-2747-469C-9093-3345B1D99E0C}.Release_MBCS|Win32.ActiveCfg = Release|Win32
{11B20554-2747-469C-9093-3345B1D99E0C}.Release_MBCS|Win32.Build.0 = Release|Win32
{11B20554-2747-469C-9093-3345B1D99E0C}.Release_MBCS|x64.ActiveCfg = Release|Win32
{11B20554-2747-469C-9093-3345B1D99E0C}.Release|Win32.ActiveCfg = Release|Win32 {11B20554-2747-469C-9093-3345B1D99E0C}.Release|Win32.ActiveCfg = Release|Win32
{11B20554-2747-469C-9093-3345B1D99E0C}.Release|Win32.Build.0 = Release|Win32 {11B20554-2747-469C-9093-3345B1D99E0C}.Release|Win32.Build.0 = Release|Win32
{11B20554-2747-469C-9093-3345B1D99E0C}.Release|x64.ActiveCfg = Release|Win32
{6BB08A9D-BBD3-433A-A6D9-079C84EBE270}.Debug_MBCS|Win32.ActiveCfg = Debug|Win32
{6BB08A9D-BBD3-433A-A6D9-079C84EBE270}.Debug_MBCS|Win32.Build.0 = Debug|Win32
{6BB08A9D-BBD3-433A-A6D9-079C84EBE270}.Debug_MBCS|x64.ActiveCfg = Debug|Win32
{6BB08A9D-BBD3-433A-A6D9-079C84EBE270}.Debug|Win32.ActiveCfg = Debug|Win32 {6BB08A9D-BBD3-433A-A6D9-079C84EBE270}.Debug|Win32.ActiveCfg = Debug|Win32
{6BB08A9D-BBD3-433A-A6D9-079C84EBE270}.Debug|Win32.Build.0 = Debug|Win32 {6BB08A9D-BBD3-433A-A6D9-079C84EBE270}.Debug|Win32.Build.0 = Debug|Win32
{6BB08A9D-BBD3-433A-A6D9-079C84EBE270}.Debug|x64.ActiveCfg = Debug|Win32
{6BB08A9D-BBD3-433A-A6D9-079C84EBE270}.Release_MBCS|Win32.ActiveCfg = Release|Win32
{6BB08A9D-BBD3-433A-A6D9-079C84EBE270}.Release_MBCS|Win32.Build.0 = Release|Win32
{6BB08A9D-BBD3-433A-A6D9-079C84EBE270}.Release_MBCS|x64.ActiveCfg = Release|Win32
{6BB08A9D-BBD3-433A-A6D9-079C84EBE270}.Release|Win32.ActiveCfg = Release|Win32 {6BB08A9D-BBD3-433A-A6D9-079C84EBE270}.Release|Win32.ActiveCfg = Release|Win32
{6BB08A9D-BBD3-433A-A6D9-079C84EBE270}.Release|Win32.Build.0 = Release|Win32 {6BB08A9D-BBD3-433A-A6D9-079C84EBE270}.Release|Win32.Build.0 = Release|Win32
{6BB08A9D-BBD3-433A-A6D9-079C84EBE270}.Release|x64.ActiveCfg = Release|Win32
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug_MBCS|Win32.ActiveCfg = Debug_MBCS|Win32
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug_MBCS|Win32.Build.0 = Debug_MBCS|Win32
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug_MBCS|x64.ActiveCfg = Debug_MBCS|x64
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug_MBCS|x64.Build.0 = Debug_MBCS|x64
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug|Win32.ActiveCfg = Debug|Win32
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug|Win32.Build.0 = Debug|Win32
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug|x64.ActiveCfg = Debug|x64
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug|x64.Build.0 = Debug|x64
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release_MBCS|Win32.ActiveCfg = Release_MBCS|Win32
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release_MBCS|Win32.Build.0 = Release_MBCS|Win32
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release_MBCS|x64.ActiveCfg = Release_MBCS|x64
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release_MBCS|x64.Build.0 = Release_MBCS|x64
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release|Win32.ActiveCfg = Release|Win32
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release|Win32.Build.0 = Release|Win32
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release|x64.ActiveCfg = Release|x64
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release|x64.Build.0 = Release|x64
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

2
vsfilter/vsfilter_2008.vcproj
View File

@ -147,7 +147,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="delayimp.lib strmbaseu.lib winmm.lib" AdditionalDependencies="delayimp.lib winmm.lib"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="..\lib" AdditionalLibraryDirectories="..\lib"
ModuleDefinitionFile=".\vsfilter.def" ModuleDefinitionFile=".\vsfilter.def"