OpenSDE Packages Database (without history before r20070)
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

127 lines
4.6 KiB

  1. # --- SDE-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # Filename: package/.../dvdstyler/x86_64.patch
  5. # Copyright (C) 2006 The OpenSDE Project
  6. #
  7. # More information can be found in the files COPYING and README.
  8. #
  9. # This patch file is dual-licensed. It is available under the license the
  10. # patched project is licensed under, as long as it is an OpenSource license
  11. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12. # of the GNU General Public License as published by the Free Software
  13. # Foundation; either version 2 of the License, or (at your option) any later
  14. # version.
  15. # --- SDE-COPYRIGHT-NOTE-END ---
  16. diff -ur DVDStyler-1.4_orig/src/ButtonPropDlg.cpp DVDStyler-1.4/src/ButtonPropDlg.cpp
  17. --- DVDStyler-1.4_orig/src/ButtonPropDlg.cpp 2006-08-25 14:06:34.000000000 +0100
  18. +++ DVDStyler-1.4/src/ButtonPropDlg.cpp 2006-08-25 14:20:22.000000000 +0100
  19. @@ -61,7 +61,7 @@
  20. if (!customAction.length())
  21. {
  22. // check if selection was ok, otherwise set this action as custom action
  23. - int tsi = m_object->GetActionTsi() > -2 ? m_object->GetActionTsi() : m_tsi;
  24. + long tsi = m_object->GetActionTsi() > -2 ? m_object->GetActionTsi() : m_tsi;
  25. if (GetTsi() != tsi || GetPgci() != m_object->GetActionPgci() ||
  26. GetChapter() != m_object->GetActionChapter())
  27. customAction = m_object->GetAction();
  28. @@ -112,21 +112,21 @@
  29. sizer->Add(mainSizer, 1, wxEXPAND|wxALL, 10);
  30. }
  31. -int ButtonPropDlg::GetTsi()
  32. +long ButtonPropDlg::GetTsi()
  33. {
  34. if (m_titlesetChoice->GetSelection() >= 0)
  35. - return ((int) m_titlesetChoice->GetClientData(m_titlesetChoice->GetSelection()))-1;
  36. + return ((long) m_titlesetChoice->GetClientData(m_titlesetChoice->GetSelection()))-1;
  37. return 0;
  38. }
  39. -int ButtonPropDlg::GetPgci()
  40. +long ButtonPropDlg::GetPgci()
  41. {
  42. if (m_targetChoice->GetSelection() >= 0)
  43. - return (int) m_targetChoice->GetClientData(m_targetChoice->GetSelection());
  44. + return (long) m_targetChoice->GetClientData(m_targetChoice->GetSelection());
  45. return 0;
  46. }
  47. -int ButtonPropDlg::GetChapter()
  48. +long ButtonPropDlg::GetChapter()
  49. {
  50. if (m_chapterChoice->GetSelection() >= 0)
  51. return m_chapterChoice->GetSelection();
  52. @@ -137,7 +137,7 @@
  53. {
  54. int sel = 0;
  55. wxChoice* ctrl = m_titlesetChoice;
  56. - int tsi = m_object->GetActionTsi() > -2 ? m_object->GetActionTsi() : m_tsi;
  57. + long tsi = m_object->GetActionTsi() > -2 ? m_object->GetActionTsi() : m_tsi;
  58. ctrl->Clear();
  59. if (m_dvd->GetVmgm().GetCount()>0)
  60. ctrl->Append(_("video manager"), (void*) 0);
  61. @@ -157,8 +157,8 @@
  62. {
  63. int sel = 0;
  64. wxChoice* ctrl = m_targetChoice;
  65. - int tsi = GetTsi();
  66. - int pgci = ctrl->GetCount() ? GetPgci() : m_object->GetActionPgci();
  67. + long tsi = GetTsi();
  68. + long pgci = ctrl->GetCount() ? GetPgci() : m_object->GetActionPgci();
  69. ctrl->Clear();
  70. PgcArray& pgcs = m_dvd->GetPgcArray(tsi, true);
  71. for (int i=0; i<(int)pgcs.Count(); i++)
  72. @@ -185,9 +185,9 @@
  73. void ButtonPropDlg::UpdateChapters()
  74. {
  75. wxChoice* ctrl = m_chapterChoice;
  76. - int tsi = GetTsi();
  77. - int pgci = GetPgci();
  78. - int chapter = ctrl->GetCount() ? GetChapter() : m_object->GetActionChapter();
  79. + long tsi = GetTsi();
  80. + long pgci = GetPgci();
  81. + long chapter = ctrl->GetCount() ? GetChapter() : m_object->GetActionChapter();
  82. ctrl->Clear();
  83. ctrl->Append(wxString::Format(_("chapter %d"), 1));
  84. if (tsi>=0 && pgci%2 == 1)
  85. @@ -296,9 +296,9 @@
  86. return false;
  87. }
  88. int n = 1;
  89. - int tsi = ((int)GetClientData(n++))-1;
  90. + long tsi = ((long)GetClientData(n++))-1;
  91. m_object->SetActionTsi(tsi != m_tsi ? tsi : -2);
  92. - m_object->SetActionPgci((int)GetClientData(n++));
  93. + m_object->SetActionPgci((long)GetClientData(n++));
  94. m_object->SetActionChapter(GetInt(n++));
  95. if (GetBool(n++))
  96. m_object->SetCustomAction(GetString(n));
  97. diff -ur DVDStyler-1.4_orig/src/ButtonPropDlg.h DVDStyler-1.4/src/ButtonPropDlg.h
  98. --- DVDStyler-1.4_orig/src/ButtonPropDlg.h 2006-08-25 14:06:34.000000000 +0100
  99. +++ DVDStyler-1.4/src/ButtonPropDlg.h 2006-08-25 14:20:24.000000000 +0100
  100. @@ -31,17 +31,17 @@
  101. MenuButton* m_object;
  102. Menu* m_menu;
  103. DVD* m_dvd;
  104. - int m_tsi;
  105. - int m_pgci;
  106. - int m_btInd;
  107. + long m_tsi;
  108. + long m_pgci;
  109. + long m_btInd;
  110. void CreatePropPanel(wxSizer* sizer);
  111. wxChoice* m_titlesetChoice;
  112. wxChoice* m_targetChoice;
  113. wxChoice* m_chapterChoice;
  114. - int GetTsi(); // returns selected titleset id
  115. - int GetPgci(); // returns selected pgc (target) id
  116. - int GetChapter(); // returns selected chapter nummer
  117. + long GetTsi(); // returns selected titleset id
  118. + long GetPgci(); // returns selected pgc (target) id
  119. + long GetChapter(); // returns selected chapter nummer
  120. void UpdateTitlesets();
  121. void UpdateTargets();
  122. void UpdateChapters();