mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

introduce NO_FEX define to disable Fex

Browse source 
Originally committed to SVN as r176.
This commit is contained in:
David Lamparter 2006-02-26 02:49:38 +00:00
parent 817f13bbc7
commit f6051a060f
4 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/ass_dialogue.cpp
View file

@ -42,15 +42,18 @@
#include "utils.h" #include "utils.h"
#include <fstream> #include <fstream>
#include <wx/tokenzr.h> #include <wx/tokenzr.h>
#ifndef NO_FEX
#include "FexTracker.h" #include "FexTracker.h"
#include "FexMovement.h" #include "FexMovement.h"
#endif
////////////////////// AssDialogue ////////////////////// ////////////////////// AssDialogue //////////////////////
// Constructs AssDialogue // Constructs AssDialogue
AssDialogue::AssDialogue() { AssDialogue::AssDialogue() {
#ifndef NO_FEX
Tracker = 0; Tracker = 0;
Movement = 0; Movement = 0;
#endif
Type = ENTRY_DIALOGUE; Type = ENTRY_DIALOGUE;
group = _T("[Events]"); group = _T("[Events]");
@ -72,8 +75,10 @@ AssDialogue::AssDialogue() {
AssDialogue::AssDialogue(wxString _data,bool IsSSA) { AssDialogue::AssDialogue(wxString _data,bool IsSSA) {
#ifndef NO_FEX
Tracker = 0; Tracker = 0;
Movement = 0; Movement = 0;
#endif
Type = ENTRY_DIALOGUE; Type = ENTRY_DIALOGUE;
group = _T("[Events]"); group = _T("[Events]");
@ -97,6 +102,7 @@ AssDialogue::~AssDialogue () {
// Clear // Clear
void AssDialogue::Clear () { void AssDialogue::Clear () {
ClearBlocks(); ClearBlocks();
#ifndef NO_FEX
if( Tracker ) if( Tracker )
{ {
delete Tracker; delete Tracker;
@ -107,6 +113,7 @@ void AssDialogue::Clear () {
DeleteMovement( Movement ); DeleteMovement( Movement );
Movement = 0; Movement = 0;
} }
#endif
} }

4
core/ass_dialogue.h
View file

@ -42,8 +42,10 @@
#include <vector> #include <vector>
#include "ass_entry.h" #include "ass_entry.h"
#include "ass_time.h" #include "ass_time.h"
#ifndef NO_FEX
class FexTracker; class FexTracker;
class FexMovement; class FexMovement;
#endif
////////////// //////////////
@ -167,8 +169,10 @@ public:
wxString Actor; // Actor name wxString Actor; // Actor name
wxString Effect; // Effect name wxString Effect; // Effect name
wxString Text; // Raw text data wxString Text; // Raw text data
#ifndef NO_FEX
FexTracker *Tracker; // Point tracker FexTracker *Tracker; // Point tracker
FexMovement *Movement; // Point tracker generated movement FexMovement *Movement; // Point tracker generated movement
#endif
bool Parse(bool IsSSA=false); // Parses raw ASS data into everything else bool Parse(bool IsSSA=false); // Parses raw ASS data into everything else
void ParseASSTags(); // Parses text to generate block information (doesn't update data) void ParseASSTags(); // Parses text to generate block information (doesn't update data)

6
core/frame_main_events.cpp
View file

@ -72,11 +72,13 @@
#include "toggle_bitmap.h" #include "toggle_bitmap.h"
#include "dialog_hotkeys.h" #include "dialog_hotkeys.h"
#include "dialog_timing_processor.h" #include "dialog_timing_processor.h"
#ifndef NO_FEX
#include "FexTracker.h" #include "FexTracker.h"
#include "FexTrackingFeature.h" #include "FexTrackingFeature.h"
#include "FexMovement.h" #include "FexMovement.h"
#include "dialog_progress.h"
#include "dialog_fextracker.h" #include "dialog_fextracker.h"
#endif
#include "dialog_progress.h"
//////////////////// ////////////////////
@ -90,6 +92,7 @@ BEGIN_EVENT_TABLE(FrameMain, wxFrame)
EVT_BUTTON(Video_Stop, FrameMain::OnVideoStop) EVT_BUTTON(Video_Stop, FrameMain::OnVideoStop)
EVT_TOGGLEBUTTON(Video_Auto_Scroll, FrameMain::OnVideoToggleScroll) EVT_TOGGLEBUTTON(Video_Auto_Scroll, FrameMain::OnVideoToggleScroll)
#ifndef NO_FEX
EVT_BUTTON(Video_Tracker_Menu, FrameMain::OnVideoTrackerMenu) EVT_BUTTON(Video_Tracker_Menu, FrameMain::OnVideoTrackerMenu)
EVT_MENU(Video_Track_Points, FrameMain::OnVideoTrackPoints) EVT_MENU(Video_Track_Points, FrameMain::OnVideoTrackPoints)
EVT_MENU(Video_Track_Point_Add, FrameMain::OnVideoTrackPointAdd) EVT_MENU(Video_Track_Point_Add, FrameMain::OnVideoTrackPointAdd)
@ -101,6 +104,7 @@ BEGIN_EVENT_TABLE(FrameMain, wxFrame)
EVT_MENU(Video_Track_Movement_MoveBefore, FrameMain::OnVideoTrackMovementMoveBefore) EVT_MENU(Video_Track_Movement_MoveBefore, FrameMain::OnVideoTrackMovementMoveBefore)
EVT_MENU(Video_Track_Movement_MoveAfter, FrameMain::OnVideoTrackMovementMoveAfter) EVT_MENU(Video_Track_Movement_MoveAfter, FrameMain::OnVideoTrackMovementMoveAfter)
EVT_MENU(Video_Track_Split_Line, FrameMain::OnVideoTrackSplitLine) EVT_MENU(Video_Track_Split_Line, FrameMain::OnVideoTrackSplitLine)
#endif
EVT_CLOSE(FrameMain::OnCloseWindow) EVT_CLOSE(FrameMain::OnCloseWindow)

6
core/video_display.cpp
View file

@ -55,9 +55,11 @@
#include <wx/clipbrd.h> #include <wx/clipbrd.h>
#include <wx/filename.h> #include <wx/filename.h>
#include <wx/config.h> #include <wx/config.h>
#ifndef NO_FEX
#include "FexTracker.h" #include "FexTracker.h"
#include "FexTrackingFeature.h" #include "FexTrackingFeature.h"
#include "FexMovement.h" #include "FexMovement.h"
#endif
/////// ///////
@ -267,6 +269,7 @@ void VideoDisplay::OnMouseEvent(wxMouseEvent& event) {
int x = event.GetX(); int x = event.GetX();
int y = event.GetY(); int y = event.GetY();
#ifndef NO_FEX
if( event.ButtonDown(wxMOUSE_BTN_LEFT) ) if( event.ButtonDown(wxMOUSE_BTN_LEFT) )
{ {
MouseDownX = x; MouseDownX = x;
@ -325,6 +328,7 @@ void VideoDisplay::OnMouseEvent(wxMouseEvent& event) {
MouseDownY = y; MouseDownY = y;
} }
} }
#endif
// Text of current coords // Text of current coords
int sw,sh; int sw,sh;
@ -627,6 +631,7 @@ void VideoDisplay::OnCopyCoords(wxCommandEvent &event) {
// Draw Tracking Overlay // Draw Tracking Overlay
void VideoDisplay::DrawTrackingOverlay( wxDC &dc ) void VideoDisplay::DrawTrackingOverlay( wxDC &dc )
{ {
#ifndef NO_FEX
if( IsPlaying ) return; if( IsPlaying ) return;
// Get line // Get line
@ -706,6 +711,7 @@ void VideoDisplay::DrawTrackingOverlay( wxDC &dc )
f3 = f2; f3 = f2;
} }
} }
#endif
} }