+/* frmQueue.cs $\r
+ \r
+ This file is part of the HandBrake source code.\r
+ Homepage: <http://handbrake.fr>.\r
+ It may be used under the terms of the GNU General Public License. */\r
+\r
using System;\r
using System.Collections.Generic;\r
using System.ComponentModel;\r
-using System.Data;\r
-using System.Drawing;\r
-using System.Text;\r
using System.Windows.Forms;\r
-using System.Threading;\r
-using System.Diagnostics;\r
-using System.Runtime.InteropServices;\r
+using Handbrake.EncodeQueue;\r
+using System.Collections.ObjectModel;\r
\r
namespace Handbrake\r
{\r
public partial class frmQueue : Form\r
{\r
- // Declarations\r
- private delegate void ProgressUpdateHandler();\r
- private delegate void getQueueItem();\r
- private delegate void setEncoding();\r
- private delegate void modifyQueue();\r
-\r
- // Everything starts Here\r
- public frmQueue()\r
+ private delegate void UpdateHandler();\r
+ private EncodeAndQueueHandler queue;\r
+\r
+ public frmQueue(EncodeAndQueueHandler q)\r
{\r
InitializeComponent();\r
+\r
+ this.queue = q;\r
+ queue.NewJobStarted += new EventHandler(queueOnEncodeStart);\r
+ queue.QueueCompleted += new EventHandler(queueOnQueueFinished);\r
+ queue.QueuePauseRequested += new EventHandler(queueOnPaused);\r
+ }\r
+ void queueOnPaused(object sender, EventArgs e)\r
+ {\r
+ setUIEncodeFinished();\r
+ updateUIElements();\r
+ }\r
+ void queueOnQueueFinished(object sender, EventArgs e)\r
+ {\r
+ setUIEncodeFinished();\r
+ resetQueue(); // Reset the Queue Window\r
+ }\r
+ void queueOnEncodeStart(object sender, EventArgs e)\r
+ {\r
+ setUIEncodeStarted(); // make sure the UI is set correctly\r
+ setCurrentEncodeInformation();\r
+ updateUIElements(); // Redraw the Queue, a new encode has started.\r
}\r
\r
- #region encode queue Handlnig\r
+ /// <summary>\r
+ /// Initializes the Queue list with the Arraylist from the Queue class\r
+ /// </summary>\r
+ public void setQueue()\r
+ {\r
+ updateUIElements();\r
+ }\r
\r
- // Declarations\r
- Boolean cancel = false;\r
- string foundQuery = "";\r
- [DllImport("user32.dll")]\r
- public static extern void LockWorkStation();\r
- [DllImport("user32.dll")]\r
- public static extern int ExitWindowsEx(int uFlags, int dwReason);\r
+ /// <summary>\r
+ /// Initializes the Queue list, then shows and activates the window\r
+ /// </summary>\r
+ public new void Show()\r
+ {\r
+ Show(true);\r
+ }\r
\r
- // Methods\r
- private void btn_q_encoder_Click(object sender, EventArgs e)\r
+ /// <summary>\r
+ /// Initializes the Queue list only if doSetQueue is true, then shows and activates the window\r
+ /// </summary>\r
+ /// <param name="doSetQueue">Indicates whether to call setQueue() before showing the window</param>\r
+ public void Show(bool doSetQueue)\r
{\r
- // Reset some values\r
+ if (doSetQueue) setQueue();\r
+ base.Show();\r
\r
- lbl_status.Visible = false;\r
- cancel = false;\r
+ //Activate();\r
+ }\r
\r
- // Start the encode\r
- try\r
+ // Start and Stop Controls\r
+ private void btn_encode_Click(object sender, EventArgs e)\r
+ {\r
+ if (queue.PauseRequested)\r
{\r
- if (listview_queue.Items.Count != 0)\r
- {\r
- // Setup or reset some values\r
- btn_cancel.Visible = true;\r
- progressBar.Value = 0;\r
- lbl_progressValue.Text = "0 %";\r
- progressBar.Step = 100 / listview_queue.Items.Count;\r
- progressBar.Update();\r
- //ThreadPool.QueueUserWorkItem(startProc);\r
- // Testing a new way of launching a thread. Hopefully will fix a random freeze up of the main thread.\r
- Thread theQ = new Thread(startProc);\r
- theQ.Start();\r
- }\r
+ setUIEncodeStarted();\r
+ MessageBox.Show("Encoding restarted", "Information", MessageBoxButtons.OK, MessageBoxIcon.Information);\r
}\r
- catch (Exception exc)\r
+\r
+ if (!queue.isEncoding)\r
+ queue.StartEncodeQueue();\r
+\r
+ }\r
+ private void btn_pause_Click(object sender, EventArgs e)\r
+ {\r
+ queue.RequestPause();\r
+ setUIEncodeFinished();\r
+ resetQueue();\r
+ MessageBox.Show("No further items on the queue will start. The current encode process will continue until it is finished. \nClick 'Encode' when you wish to continue encoding the queue.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
+ }\r
+\r
+ // Window Display Management\r
+ private void setUIEncodeStarted()\r
+ {\r
+ if (InvokeRequired)\r
{\r
- MessageBox.Show(exc.ToString());\r
+ BeginInvoke(new UpdateHandler(setUIEncodeStarted));\r
+ return;\r
}\r
+ btn_encode.Enabled = false;\r
+ btn_pause.Visible = true;\r
}\r
-\r
- private void btn_cancel_Click(object sender, EventArgs e)\r
+ private void setUIEncodeFinished()\r
{\r
- cancel = true;\r
- btn_cancel.Visible = false;\r
- MessageBox.Show("No further items on the queue will start. The current encode process will continue until it is finished. \nClick 'Encode Video' when you wish to continue encoding the queue.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
+ if (InvokeRequired)\r
+ {\r
+ BeginInvoke(new UpdateHandler(setUIEncodeFinished));\r
+ return;\r
+ }\r
+ btn_pause.Visible = false;\r
+ btn_encode.Enabled = true;\r
}\r
-\r
- private void startProc(object state)\r
+ private void resetQueue()\r
{\r
- try\r
+ if (InvokeRequired)\r
{\r
- while (listview_queue.Items.Count != 0)\r
- {\r
- getItem();\r
- string query = foundQuery;\r
- query = query.Replace("ListViewItem: { ", "").Replace(" }", "").Trim();\r
- updateUIElements();\r
- setEncValue();\r
+ BeginInvoke(new UpdateHandler(resetQueue));\r
+ return;\r
+ }\r
+ btn_pause.Visible = false;\r
+ btn_encode.Enabled = true;\r
\r
- Functions.CLI process = new Functions.CLI();\r
- Process hbProc = process.runCli(this, query, false, false, false, false);\r
+ lbl_source.Text = "-";\r
+ lbl_dest.Text = "-";\r
+ lbl_vEnc.Text = "-";\r
+ lbl_aEnc.Text = "-";\r
+ lbl_title.Text = "-";\r
+ lbl_chapt.Text = "-";\r
\r
- hbProc.WaitForExit();\r
- hbProc.Close();\r
- hbProc.Dispose();\r
+ lbl_encodesPending.Text = list_queue.Items.Count + " encode(s) pending";\r
+ }\r
+ private void redrawQueue()\r
+ {\r
+ if (InvokeRequired)\r
+ {\r
+ BeginInvoke(new UpdateHandler(redrawQueue));\r
+ return;\r
+ }\r
\r
- query = "";\r
+ list_queue.Items.Clear();\r
+ ReadOnlyCollection<Job> theQueue = queue.CurrentQueue;\r
+ foreach (Job queue_item in theQueue)\r
+ {\r
+ string q_item = queue_item.Query;\r
+ Functions.QueryParser parsed = Functions.QueryParser.Parse(q_item);\r
\r
- if (cancel == true)\r
- {\r
- break;\r
- }\r
+ // Get the DVD Title\r
+ string title = parsed.DVDTitle == 0 ? "Auto" : parsed.DVDTitle.ToString();\r
\r
+ // Get the DVD Chapters\r
+ string chapters;\r
+ if (parsed.DVDChapterStart == 0)\r
+ chapters = "Auto";\r
+ else\r
+ {\r
+ chapters = parsed.DVDChapterStart.ToString();\r
+ if (parsed.DVDChapterFinish != 0)\r
+ chapters = chapters + " - " + parsed.DVDChapterFinish;\r
}\r
\r
- resetQueue();\r
+ ListViewItem item = new ListViewItem();\r
+ item.Text = title; // Title\r
+ item.SubItems.Add(chapters); // Chapters\r
+ item.SubItems.Add(queue_item.Source); // Source\r
+ item.SubItems.Add(queue_item.Destination); // Destination\r
+ item.SubItems.Add(parsed.VideoEncoder); // Video\r
\r
- // Do something whent he encode ends.\r
- switch (Properties.Settings.Default.CompletionOption)\r
+ // Display The Audio Track Information\r
+ string audio = string.Empty;\r
+ foreach (Functions.AudioTrack track in parsed.AudioInformation)\r
{\r
- case "Shutdown":\r
- System.Diagnostics.Process.Start("Shutdown", "-s -t 60");\r
- break;\r
- case "Log Off":\r
- ExitWindowsEx(0, 0);\r
- break;\r
- case "Suspend":\r
- Application.SetSuspendState(PowerState.Suspend, true, true);\r
- break;\r
- case "Hibernate":\r
- Application.SetSuspendState(PowerState.Hibernate, true, true);\r
- break;\r
- case "Lock System":\r
- LockWorkStation();\r
- break;\r
- case "Quit HandBrake":\r
- Application.Exit();\r
- break;\r
- default:\r
- break;\r
+ if (audio != "")\r
+ audio += ", " + track.Encoder;\r
+ else\r
+ audio = track.Encoder;\r
}\r
- }\r
- catch (Exception exc)\r
- {\r
- MessageBox.Show(exc.ToString());\r
+ item.SubItems.Add(audio); // Audio\r
+\r
+ list_queue.Items.Add(item);\r
}\r
}\r
-\r
- private void getItem()\r
+ private void updateUIElements()\r
{\r
- try\r
+ if (InvokeRequired)\r
{\r
- if (this.InvokeRequired)\r
- {\r
- this.BeginInvoke(new getQueueItem(getItem));\r
- }\r
- foundQuery = this.listview_queue.Items[0].ToString();\r
- }\r
- catch (Exception)\r
- {\r
- // Do Nothing\r
+ BeginInvoke(new UpdateHandler(updateUIElements));\r
+ return;\r
}\r
- }\r
\r
- private void setEncValue()\r
+ redrawQueue();\r
+ lbl_encodesPending.Text = list_queue.Items.Count + " encode(s) pending";\r
+ }\r
+ private void setCurrentEncodeInformation()\r
{\r
try\r
{\r
- if (this.InvokeRequired)\r
+ if (InvokeRequired)\r
{\r
- this.BeginInvoke(new setEncoding(setEncValue));\r
+ BeginInvoke(new UpdateHandler(setCurrentEncodeInformation));\r
}\r
\r
- string query = null;\r
- ListView.SelectedListViewItemCollection name = null;\r
- name = listview_queue.SelectedItems;\r
-\r
- if (listview_queue.SelectedItems.Count != 0)\r
- query = name[0].SubItems[0].Text;\r
-\r
// found query is a global varible\r
- Functions.QueryParser parsed = Functions.QueryParser.Parse(foundQuery);\r
- lbl_source.Text = parsed.Source;\r
- lbl_dest.Text = parsed.Destination;\r
+ Functions.QueryParser parsed = Functions.QueryParser.Parse(queue.LastEncode.Query);\r
+ lbl_source.Text = queue.LastEncode.Source;\r
+ lbl_dest.Text = queue.LastEncode.Destination;\r
\r
+ lbl_title.Text = parsed.DVDTitle == 0 ? "Auto" : parsed.DVDTitle.ToString();\r
\r
- if (parsed.DVDTitle == 0)\r
- lbl_title.Text = "Auto";\r
- else\r
- lbl_title.Text = parsed.DVDTitle.ToString();\r
-\r
- string chatpers = "";\r
- if (parsed.DVDChapterStart == 0)\r
- {\r
+ if (Equals(parsed.DVDChapterStart, 0))\r
lbl_chapt.Text = "Auto";\r
- }\r
else\r
{\r
- chatpers = parsed.DVDChapterStart.ToString();\r
+ string chapters = parsed.DVDChapterStart.ToString();\r
if (parsed.DVDChapterFinish != 0)\r
- chatpers = chatpers + " - " + parsed.DVDChapterFinish;\r
- lbl_chapt.Text = parsed.DVDChapterStart + chatpers;\r
+ chapters = chapters + " - " + parsed.DVDChapterFinish;\r
+ lbl_chapt.Text = chapters;\r
}\r
\r
lbl_vEnc.Text = parsed.VideoEncoder;\r
- lbl_aEnc.Text = parsed.AudioEncoder;\r
+\r
+ // Display The Audio Track Information\r
+ string audio = string.Empty;\r
+ foreach (Functions.AudioTrack track in parsed.AudioInformation)\r
+ {\r
+ if (audio != "")\r
+ audio += ", " + track.Encoder;\r
+ else\r
+ audio = track.Encoder;\r
+ }\r
+ lbl_aEnc.Text = audio;\r
}\r
catch (Exception)\r
{\r
// Do Nothing\r
}\r
-\r
}\r
-\r
- private void updateUIElements()\r
+ private void deleteSelectedItems()\r
{\r
- try\r
+ // If there are selected items\r
+ if (list_queue.SelectedIndices.Count > 0)\r
{\r
- if (this.InvokeRequired)\r
- {\r
- this.BeginInvoke(new ProgressUpdateHandler(updateUIElements));\r
- return;\r
- }\r
- this.listview_queue.Items.RemoveAt(0);\r
+ // Save the selected indices to select them after the move\r
+ List<int> selectedIndices = new List<int>(list_queue.SelectedIndices.Count);\r
+ foreach (int selectedIndex in list_queue.SelectedIndices)\r
+ selectedIndices.Add(selectedIndex);\r
\r
- progressBar.PerformStep();\r
- lbl_progressValue.Text = string.Format("{0} %", progressBar.Value);\r
- progressBar.Update();\r
- }\r
- catch (Exception exc)\r
- {\r
- MessageBox.Show(exc.ToString());\r
- }\r
- }\r
+ int firstSelectedIndex = selectedIndices[0];\r
\r
- private void resetQueue()\r
- {\r
- try\r
- {\r
- if (this.InvokeRequired)\r
- {\r
- this.BeginInvoke(new ProgressUpdateHandler(resetQueue));\r
- return;\r
- }\r
+ // Reverse the list to delete the items from last to first (preserves indices)\r
+ selectedIndices.Reverse();\r
\r
- if (cancel == true)\r
- {\r
- lbl_status.Visible = true;\r
- lbl_status.Text = "Encode Queue Cancelled!";\r
- }\r
- else\r
- {\r
- lbl_status.Visible = true;\r
- lbl_status.Text = "Encode Queue Completed!";\r
- }\r
- btn_cancel.Visible = false;\r
-\r
- lbl_progressValue.Text = "0 %";\r
- progressBar.Value = 0;\r
- progressBar.Update();\r
-\r
- lbl_source.Text = "-";\r
- lbl_dest.Text = "-";\r
- lbl_vEnc.Text = "-";\r
- lbl_aEnc.Text = "-";\r
- lbl_title.Text = "-";\r
- lbl_chapt.Text = "-";\r
- }\r
- catch (Exception exc)\r
- {\r
- MessageBox.Show(exc.ToString());\r
+ // Remove each selected item\r
+ foreach (int selectedIndex in selectedIndices)\r
+ queue.RemoveJob(selectedIndex);\r
+\r
+ updateUIElements();\r
+\r
+ // Select the item where the first deleted item was previously\r
+ if (firstSelectedIndex < list_queue.Items.Count)\r
+ list_queue.Items[firstSelectedIndex].Selected = true;\r
}\r
- }\r
\r
- #endregion\r
+ list_queue.Select(); // Activate the control to show the selected items\r
+ }\r
\r
- #region Queue Management\r
+ // Queue Management\r
+ private void mnu_up_Click(object sender, EventArgs e)\r
+ {\r
+ moveUp();\r
+ }\r
+ private void mnu_Down_Click(object sender, EventArgs e)\r
+ {\r
+ moveDown();\r
+ }\r
+ private void mnu_delete_Click(object sender, EventArgs e)\r
+ {\r
+ deleteSelectedItems();\r
+ }\r
private void btn_up_Click(object sender, EventArgs e)\r
{\r
- string cache;\r
- int selIdx;\r
- if (listview_queue.Items.Count != 0)\r
- {\r
- selIdx = listview_queue.SelectedItems[0].Index;\r
- // ignore moveup of row(0)\r
- if (selIdx == 0)\r
- return;\r
-\r
- // move the subitems for the previous row\r
- // to cache to make room for the selected row\r
- for (int i = 0; i < listview_queue.Items[selIdx].SubItems.Count; i++)\r
- {\r
- cache = listview_queue.Items[selIdx - 1].SubItems[i].Text;\r
- listview_queue.Items[selIdx - 1].SubItems[i].Text =\r
- listview_queue.Items[selIdx].SubItems[i].Text;\r
- listview_queue.Items[selIdx].SubItems[i].Text = cache;\r
- }\r
- listview_queue.Items[selIdx - 1].Selected = true;\r
- listview_queue.Refresh();\r
- listview_queue.Focus();\r
- }\r
+ moveUp();\r
}\r
-\r
private void btn_down_Click(object sender, EventArgs e)\r
{\r
- string cache;\r
- int selIdx;\r
- \r
- if (listview_queue.Items.Count != 0)\r
- {\r
- selIdx = listview_queue.SelectedItems[0].Index;\r
-\r
- // ignore movedown of last item\r
- if (selIdx == listview_queue.Items.Count - 1)\r
- return;\r
- // move the subitems for the next row\r
- // to cache so we can move the selected row down\r
- for (int i = 0; i < listview_queue.Items[selIdx].SubItems.Count; i++)\r
- {\r
- cache = listview_queue.Items[selIdx + 1].SubItems[i].Text;\r
- listview_queue.Items[selIdx + 1].SubItems[i].Text =\r
- listview_queue.Items[selIdx].SubItems[i].Text;\r
- listview_queue.Items[selIdx].SubItems[i].Text = cache;\r
- }\r
- listview_queue.Items[selIdx + 1].Selected = true;\r
- listview_queue.Refresh();\r
- listview_queue.Focus();\r
- }\r
+ moveDown();\r
}\r
-\r
private void btn_delete_Click(object sender, EventArgs e)\r
{\r
- for (int i = listview_queue.SelectedItems.Count - 1; i >= 0; i--)\r
- {\r
- ListViewItem item = listview_queue.SelectedItems[i];\r
- listview_queue.Items.Remove(item);\r
- }\r
+ deleteSelectedItems();\r
}\r
- #endregion\r
-\r
- #region Modify Queue\r
-\r
- int listCount = 0;\r
- private void listview_queue_SelectedIndexChanged(object sender, EventArgs e)\r
+ private void list_queue_deleteKey(object sender, KeyEventArgs e)\r
{\r
- modQ();\r
- listCount = listview_queue.Items.Count;\r
+ if (e.KeyCode == Keys.Delete)\r
+ deleteSelectedItems();\r
}\r
-\r
- private void modQ()\r
+ private void moveUp()\r
{\r
- try\r
+ // If there are selected items and the first item is not selected\r
+ if (list_queue.SelectedIndices.Count > 0 && !list_queue.SelectedIndices.Contains(0))\r
{\r
- if (this.InvokeRequired)\r
- {\r
- this.BeginInvoke(new modifyQueue(modQ));\r
- }\r
+ // Copy the selected indices to preserve them during the movement\r
+ List<int> selectedIndices = new List<int>(list_queue.SelectedIndices.Count);\r
+ foreach (int selectedIndex in list_queue.SelectedIndices)\r
+ selectedIndices.Add(selectedIndex);\r
\r
- string query = null;\r
- ListView.SelectedListViewItemCollection name = null;\r
- name = listview_queue.SelectedItems;\r
+ // Move up each selected item\r
+ foreach (int selectedIndex in selectedIndices)\r
+ queue.MoveUp(selectedIndex);\r
\r
- if (listview_queue.SelectedItems.Count != 0)\r
- query = name[0].SubItems[0].Text;\r
-\r
- txt_editQuery.Text = query;\r
+ updateUIElements();\r
\r
+ // Keep the selected item(s) selected, now moved up one index\r
+ foreach (int selectedIndex in selectedIndices)\r
+ if (selectedIndex - 1 > -1) // Defensive programming: ensure index is good\r
+ list_queue.Items[selectedIndex - 1].Selected = true;\r
}\r
- catch (Exception)\r
+\r
+ list_queue.Select(); // Activate the control to show the selected items\r
+ }\r
+ private void moveDown()\r
+ {\r
+ // If there are selected items and the last item is not selected\r
+ if (list_queue.SelectedIndices.Count > 0 &&\r
+ !list_queue.SelectedIndices.Contains(list_queue.Items[list_queue.Items.Count - 1].Index))\r
{\r
+ // Copy the selected indices to preserve them during the movement\r
+ List<int> selectedIndices = new List<int>(list_queue.SelectedIndices.Count);\r
+ foreach (int selectedIndex in list_queue.SelectedIndices)\r
+ selectedIndices.Add(selectedIndex);\r
+\r
+ // Reverse the indices to move the items down from last to first (preserves indices)\r
+ selectedIndices.Reverse();\r
+\r
+ // Move down each selected item\r
+ foreach (int selectedIndex in selectedIndices)\r
+ queue.MoveDown(selectedIndex);\r
+\r
+ updateUIElements();\r
+\r
+ // Keep the selected item(s) selected, now moved down one index\r
+ foreach (int selectedIndex in selectedIndices)\r
+ if (selectedIndex + 1 < list_queue.Items.Count) // Defensive programming: ensure index is good\r
+ list_queue.Items[selectedIndex + 1].Selected = true;\r
}\r
+\r
+ list_queue.Select(); // Activate the control to show the selected items\r
}\r
\r
- private void btn_update_Click(object sender, EventArgs e)\r
+ // Queue Import/Export Features\r
+ private void mnu_batch_Click(object sender, EventArgs e)\r
{\r
- try\r
- {\r
- if (txt_editQuery.Text != "")\r
- {\r
- if (listview_queue.Items.Count != listCount)\r
- {\r
- MessageBox.Show("Unable to modify the selected item. The number of items on the list has changed. \nPlease avoid modifying an item when a new encode is about to start!", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
- }\r
- else\r
- {\r
- if (listview_queue.SelectedItems != null)\r
- {\r
- int selectItm = listview_queue.SelectedIndices[0];\r
- listview_queue.Items[selectItm].Text = txt_editQuery.Text;\r
- }\r
- }\r
- }\r
- }\r
- catch (Exception exc)\r
+ SaveFile.FileName = "";\r
+ SaveFile.Filter = "Batch|.bat";\r
+ SaveFile.ShowDialog();\r
+ if (SaveFile.FileName != String.Empty)\r
+ queue.WriteBatchScriptToFile(SaveFile.FileName);\r
+ }\r
+ private void mnu_export_Click(object sender, EventArgs e)\r
+ {\r
+ SaveFile.FileName = "";\r
+ SaveFile.Filter = "HandBrake Queue|*.queue";\r
+ SaveFile.ShowDialog();\r
+ if (SaveFile.FileName != String.Empty)\r
+ queue.WriteQueueStateToFile(SaveFile.FileName);\r
+ }\r
+ private void mnu_import_Click(object sender, EventArgs e)\r
+ {\r
+ OpenFile.FileName = "";\r
+ OpenFile.ShowDialog();\r
+ if (OpenFile.FileName != String.Empty)\r
+ queue.LoadQueueFromFile(OpenFile.FileName);\r
+ updateUIElements();\r
+ }\r
+ private void mnu_readd_Click(object sender, EventArgs e)\r
+ {\r
+ if (!queue.LastEncode.IsEmpty)\r
{\r
- MessageBox.Show(exc.ToString());\r
+ queue.AddJob(queue.LastEncode.Query, queue.LastEncode.Source, queue.LastEncode.Destination, queue.LastEncode.CustomQuery);\r
+ updateUIElements();\r
}\r
}\r
\r
- #endregion\r
-\r
+ // Hide's the window when the user tries to "x" out of the window instead of closing it.\r
protected override void OnClosing(CancelEventArgs e)\r
{\r
e.Cancel = true;\r
base.OnClosing(e);\r
}\r
\r
- private void btn_Close_Click(object sender, EventArgs e)\r
- {\r
- this.Hide();\r
- }\r
-\r
}\r
-}
\ No newline at end of file
+}\r
OSDN Git Service
