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

Aegisub should now be able to save TTXT 1.1 compliant files... at least, it's identical to the one generated by 'mp4box -ttxt'

Browse source 
Originally committed to SVN as r1257.
This commit is contained in:
Rodrigo Braz Monteiro 2007-06-19 01:30:27 +00:00
parent b96f4ba5d0
commit 4a63ffe94a
2 changed files with 93 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

128
aegisub/subtitle_format_ttxt.cpp
View file

@ -135,13 +135,8 @@ void TTXTSubtitleFormat::ReadFile(wxString filename,wxString forceEncoding) {
/////////////////////////// ///////////////////////////
// Process a dialogue line // Process a dialogue line
bool TTXTSubtitleFormat::ProcessLine(wxXmlNode *node) { bool TTXTSubtitleFormat::ProcessLine(wxXmlNode *node) {
// Get properties // Get time
wxString sampleTime = node->GetPropVal(_T("sampleTime"),_T("00:00:00.000")); wxString sampleTime = node->GetPropVal(_T("sampleTime"),_T("00:00:00.000"));
wxString text;
if (version == 0) text = node->GetPropVal(_T("text"),_T(""));
else text = node->GetNodeContent();
// Parse time
AssTime time; AssTime time;
time.ParseASS(sampleTime); time.ParseASS(sampleTime);
@ -149,12 +144,17 @@ bool TTXTSubtitleFormat::ProcessLine(wxXmlNode *node) {
if (diag) diag->End = time; if (diag) diag->End = time;
diag = NULL; diag = NULL;
// Get text
wxString text;
if (version == 0) text = node->GetPropVal(_T("text"),_T(""));
else text = node->GetNodeContent();
// Create line // Create line
if (!text.IsEmpty()) { if (!text.IsEmpty()) {
// Create dialogue // Create dialogue
diag = new AssDialogue(); diag = new AssDialogue();
diag->Start = time; diag->Start = time;
diag->End.SetMS(time.GetMS()+5000); diag->End.SetMS(36000000-10);
diag->group = _T("[Events]"); diag->group = _T("[Events]");
diag->Style = _T("Default"); diag->Style = _T("Default");
diag->Comment = false; diag->Comment = false;
@ -185,7 +185,6 @@ bool TTXTSubtitleFormat::ProcessLine(wxXmlNode *node) {
} }
// Insert dialogue // Insert dialogue
diag->UpdateData();
Line->push_back(diag); Line->push_back(diag);
return true; return true;
} }
@ -213,45 +212,18 @@ void TTXTSubtitleFormat::WriteFile(wxString filename,wxString encoding) {
wxXmlNode *root = new wxXmlNode(NULL,wxXML_ELEMENT_NODE,_T("TextStream")); wxXmlNode *root = new wxXmlNode(NULL,wxXML_ELEMENT_NODE,_T("TextStream"));
root->AddProperty(_T("version"),_T("1.1")); root->AddProperty(_T("version"),_T("1.1"));
doc.SetRoot(root); doc.SetRoot(root);
wxXmlNode *node,*subNode;
// Create header // Create header
node = new wxXmlNode(wxXML_ELEMENT_NODE,_T("TextStreamHeader")); WriteHeader(root);
node->AddProperty(_T("width"),_T("400"));
node->AddProperty(_T("height"),_T("60"));
root->AddChild(node);
// Create lines // Create lines
int i=1; int i=1;
using std::list; using std::list;
AssDialogue *prev = NULL; prev = NULL;
for (list<AssEntry*>::iterator cur=Line->begin();cur!=Line->end();cur++) { for (list<AssEntry*>::iterator cur=Line->begin();cur!=Line->end();cur++) {
AssDialogue *current = AssEntry::GetAsDialogue(*cur); AssDialogue *current = AssEntry::GetAsDialogue(*cur);
if (current) { if (current && !current->Comment) {
// Get line WriteLine(root,current);
if (current->Comment) throw _T("Unexpected line type (comment)");
// If it doesn't start at the end of previous, add blank
if (prev && prev->End != current->Start) {
node = new wxXmlNode(wxXML_ELEMENT_NODE,_T("TextSample"));
node->AddProperty(_T("startTime"),_T("0") + prev->End.GetASSFormated(true));
node->AddProperty(_T("xml:space"),_T("preserve"));
subNode = new wxXmlNode(wxXML_TEXT_NODE,_T(""),_T(""));
node->AddChild(subNode);
root->AddChild(node);
}
// Generate and insert node
node = new wxXmlNode(wxXML_ELEMENT_NODE,_T("TextSample"));
node->AddProperty(_T("sampleTime"),_T("0") + current->Start.GetASSFormated(true));
node->AddProperty(_T("xml:space"),_T("preserve"));
subNode = new wxXmlNode(wxXML_TEXT_NODE,_T(""),current->Text);
node->AddChild(subNode);
root->AddChild(node);
// Set as previous
prev = current;
i++; i++;
} }
else throw _T("Unexpected line type"); else throw _T("Unexpected line type");
@ -266,6 +238,84 @@ void TTXTSubtitleFormat::WriteFile(wxString filename,wxString encoding) {
} }
////////////////
// Write header
void TTXTSubtitleFormat::WriteHeader(wxXmlNode *root) {
// Write stream header
wxXmlNode *node = new wxXmlNode(wxXML_ELEMENT_NODE,_T("TextStreamHeader"));
node->AddProperty(_T("width"),_T("400"));
node->AddProperty(_T("height"),_T("60"));
node->AddProperty(_T("layer"),_T("0"));
node->AddProperty(_T("translation_x"),_T("0"));
node->AddProperty(_T("translation_y"),_T("0"));
root->AddChild(node);
root = node;
// Write sample description
node = new wxXmlNode(wxXML_ELEMENT_NODE,_T("TextSampleDescription"));
node->AddProperty(_T("horizontalJustification"),_T("center"));
node->AddProperty(_T("verticalJustification"),_T("bottom"));
node->AddProperty(_T("backColor"),_T("0 0 0 0"));
node->AddProperty(_T("verticalText"),_T("no"));
node->AddProperty(_T("fillTextRegion"),_T("no"));
node->AddProperty(_T("continuousKaraoke"),_T("no"));
node->AddProperty(_T("scroll"),_T("None"));
root->AddChild(node);
root = node;
// Write font table
node = new wxXmlNode(wxXML_ELEMENT_NODE,_T("FontTable"));
wxXmlNode *subNode = new wxXmlNode(wxXML_ELEMENT_NODE,_T("FontTableEntry"));
subNode->AddProperty(_T("fontName"),_T("Sans"));
subNode->AddProperty(_T("fontID"),_T("1"));
node->AddChild(subNode);
root->AddChild(node);
// Write text box
node = new wxXmlNode(wxXML_ELEMENT_NODE,_T("TextBox"));
node->AddProperty(_T("top"),_T("0"));
node->AddProperty(_T("left"),_T("0"));
node->AddProperty(_T("bottom"),_T("60"));
node->AddProperty(_T("right"),_T("400"));
root->AddChild(node);
// Write style
node = new wxXmlNode(wxXML_ELEMENT_NODE,_T("Style"));
node->AddProperty(_T("styles"),_T("Normal"));
node->AddProperty(_T("fontID"),_T("1"));
node->AddProperty(_T("fontSize"),_T("18"));
node->AddProperty(_T("color"),_T("ff ff ff ff"));
root->AddChild(node);
}
//////////////
// Write line
void TTXTSubtitleFormat::WriteLine(wxXmlNode *root, AssDialogue *line) {
// If it doesn't start at the end of previous, add blank
wxXmlNode *node,*subNode;
if (prev && prev->End != line->Start) {
node = new wxXmlNode(wxXML_ELEMENT_NODE,_T("TextSample"));
node->AddProperty(_T("sampleTime"),_T("0") + prev->End.GetASSFormated(true));
node->AddProperty(_T("xml:space"),_T("preserve"));
subNode = new wxXmlNode(wxXML_TEXT_NODE,_T(""),_T(""));
node->AddChild(subNode);
root->AddChild(node);
}
// Generate and insert node
node = new wxXmlNode(wxXML_ELEMENT_NODE,_T("TextSample"));
node->AddProperty(_T("sampleTime"),_T("0") + line->Start.GetASSFormated(true));
node->AddProperty(_T("xml:space"),_T("preserve"));
subNode = new wxXmlNode(wxXML_TEXT_NODE,_T(""),line->Text);
node->AddChild(subNode);
root->AddChild(node);
// Set as previous
prev = line;
}
/////////////////////// ///////////////////////
// Convert line to TTXT // Convert line to TTXT
void TTXTSubtitleFormat::DialogueToTTXT(AssDialogue *current,std::list<AssEntry*>::iterator prev) { void TTXTSubtitleFormat::DialogueToTTXT(AssDialogue *current,std::list<AssEntry*>::iterator prev) {

4
aegisub/subtitle_format_ttxt.h
View file

@ -50,10 +50,14 @@ class TTXTSubtitleFormat : public SubtitleFormat {
private: private:
int version; int version;
AssDialogue *diag; AssDialogue *diag;
AssDialogue *prev;
bool ProcessLine(wxXmlNode *node); bool ProcessLine(wxXmlNode *node);
void ProcessHeader(wxXmlNode *node); void ProcessHeader(wxXmlNode *node);
void WriteHeader(wxXmlNode *root);
void WriteLine(wxXmlNode *root,AssDialogue *line);
void ConvertToTTXT(); void ConvertToTTXT();
void DialogueToTTXT(AssDialogue *current,std::list<AssEntry*>::iterator prev); void DialogueToTTXT(AssDialogue *current,std::list<AssEntry*>::iterator prev);