tabs -> spaces.

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 5fc61557e8676d8712affb60feae7b4de68d4c66..f016cf3e4ceada4e818ba527e241506cccdfb1c3 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -416,14 +416,14 @@ private:
 static const wxCmdLineEntryDesc command_line_description[] = {
        { wxCMD_LINE_OPTION, "l", "log", "set log level (silent, verbose or timing)", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
        { wxCMD_LINE_SWITCH, "n", "new", "create new film", wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL },
-        { wxCMD_LINE_PARAM, 0, 0, "film to load or create", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_PARAM_OPTIONAL },
+       { wxCMD_LINE_PARAM, 0, 0, "film to load or create", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_PARAM_OPTIONAL },
        { wxCMD_LINE_NONE, "", "", "", wxCmdLineParamType (0), 0 }
 };
 #else
 static const wxCmdLineEntryDesc command_line_description[] = {
        { wxCMD_LINE_OPTION, wxT("l"), wxT("log"), wxT("set log level (silent, verbose or timing)"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
        { wxCMD_LINE_SWITCH, wxT("n"), wxT("new"), wxT("create new film"), wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL },
-        { wxCMD_LINE_PARAM, 0, 0, wxT("film to load or create"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_PARAM_OPTIONAL },
+       { wxCMD_LINE_PARAM, 0, 0, wxT("film to load or create"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_PARAM_OPTIONAL },
        { wxCMD_LINE_NONE, wxT(""), wxT(""), wxT(""), wxCmdLineParamType (0), 0 }
 };
 #endif

diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index ee9e2cdc08fddc0746bd08f5afbdef63745e4f7f..8727761fd583b9d554129a895ffd476f2ce43793 100644 (file)
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -45,9 +45,9 @@ help (string n)
 {
        cerr << "Syntax: " << n << " [OPTION] <FILM>\n"
             << "  -v, --version      show DCP-o-matic version\n"
-            << "  -h, --help         show this help\n"
-            << "  -d, --deps         list DCP-o-matic dependency details and quit\n"
-            << "  -f, --flags        show flags passed to C++ compiler on build\n"
+            << "  -h, --help         show this help\n"
+            << "  -d, --deps         list DCP-o-matic dependency details and quit\n"
+            << "  -f, --flags        show flags passed to C++ compiler on build\n"
             << "  -n, --no-progress  do not print progress to stdout\n"
             << "  -r, --no-remote    do not use any remote servers\n"
             << "\n"
@@ -170,9 +170,9 @@ main (int argc, char* argv[])
                                float const p = (*i)->overall_progress ();
                                
                                if (p >= 0) {
-                                       cout << (*i)->status() << "                         \n";
+                                       cout << (*i)->status() << "                         \n";
                                } else {
-                                       cout << ": Running           \n";
+                                       cout << ": Running           \n";
                                }
                        }
 

diff --git a/src/tools/dcpomatic_server_cli.cc b/src/tools/dcpomatic_server_cli.cc
index 76d0850341619c9638861e27538ee7f22285ea5b..b0c84b4eb9b8d3f6e7b31ca3c932dff1c924934d 100644 (file)
--- a/src/tools/dcpomatic_server_cli.cc
+++ b/src/tools/dcpomatic_server_cli.cc
@@ -52,7 +52,7 @@ help (string n)
 {
        cerr << "Syntax: " << n << " [OPTION]\n"
             << "  -v, --version      show DCP-o-matic version\n"
-            << "  -h, --help         show this help\n"
+            << "  -h, --help         show this help\n"
             << "  -t, --threads      number of parallel encoding threads to use\n";
 }
 

diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc
index b8b9ead256133667fd7fdb392bfd5b2ef95c124d..b2be40036be74d9d5e591b286d30f95b65cc69ad 100644 (file)
--- a/src/wx/audio_plot.cc
+++ b/src/wx/audio_plot.cc
@@ -53,11 +53,11 @@ AudioPlot::AudioPlot (wxWindow* parent)
                _type_visible[i] = false;
        }
 
-       _colours.push_back (wxColour (  0,   0,   0));
-       _colours.push_back (wxColour (255,   0,   0));
-       _colours.push_back (wxColour (  0, 255,   0));
+       _colours.push_back (wxColour (  0,   0,   0));
+       _colours.push_back (wxColour (255,   0,   0));
+       _colours.push_back (wxColour (  0, 255,   0));
        _colours.push_back (wxColour (139,   0, 204));
-       _colours.push_back (wxColour (  0,   0, 255));
+       _colours.push_back (wxColour (  0,   0, 255));
        _colours.push_back (wxColour (100, 100, 100));
        
        Connect (wxID_ANY, wxEVT_PAINT, wxPaintEventHandler (AudioPlot::paint), 0, this);

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 3e116c209abb5dc262734ca1ed2051c0b3625272..90bf79741fdfa98a9196d7994614569a3ce05de8 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -196,43 +196,43 @@ FilmEditor::make_dcp_panel ()
 void
 FilmEditor::connect_to_widgets ()
 {
-       _name->Connect                   (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED,         wxCommandEventHandler (FilmEditor::name_changed), 0, this);
-       _use_dci_name->Connect           (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED,     wxCommandEventHandler (FilmEditor::use_dci_name_toggled), 0, this);
-       _edit_dci_button->Connect        (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::edit_dci_button_clicked), 0, this);
-       _container->Connect              (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::container_changed), 0, this);
-       _ratio->Connect                  (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::ratio_changed), 0, this);
-       _content->Connect                (wxID_ANY, wxEVT_COMMAND_LIST_ITEM_SELECTED,   wxListEventHandler    (FilmEditor::content_selection_changed), 0, this);
-       _content->Connect                (wxID_ANY, wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler    (FilmEditor::content_selection_changed), 0, this);
-       _content_add->Connect            (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::content_add_clicked), 0, this);
-       _content_remove->Connect         (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::content_remove_clicked), 0, this);
-       _content_timeline->Connect       (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::content_timeline_clicked), 0, this);
-       _loop_content->Connect           (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED,     wxCommandEventHandler (FilmEditor::loop_content_toggled), 0, this);
-       _loop_count->Connect             (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::loop_count_changed), 0, this);
-       _left_crop->Connect              (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::left_crop_changed), 0, this);
-       _right_crop->Connect             (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::right_crop_changed), 0, this);
-       _top_crop->Connect               (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::top_crop_changed), 0, this);
-       _bottom_crop->Connect            (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::bottom_crop_changed), 0, this);
-       _filters_button->Connect         (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::edit_filters_clicked), 0, this);
-       _scaler->Connect                 (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::scaler_changed), 0, this);
-       _dcp_content_type->Connect       (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::dcp_content_type_changed), 0, this);
-       _dcp_frame_rate->Connect         (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::dcp_frame_rate_changed), 0, this);
-       _best_dcp_frame_rate->Connect    (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::best_dcp_frame_rate_clicked), 0, this);
-       _dcp_audio_channels->Connect     (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::dcp_audio_channels_changed), 0, this);
-       _with_subtitles->Connect         (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED,     wxCommandEventHandler (FilmEditor::with_subtitles_toggled), 0, this);
-       _subtitle_offset->Connect        (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::subtitle_offset_changed), 0, this);
-       _subtitle_scale->Connect         (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::subtitle_scale_changed), 0, this);
-       _j2k_bandwidth->Connect          (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::j2k_bandwidth_changed), 0, this);
-       _audio_gain->Connect             (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::audio_gain_changed), 0, this);
+       _name->Connect                   (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED,         wxCommandEventHandler (FilmEditor::name_changed), 0, this);
+       _use_dci_name->Connect           (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED,     wxCommandEventHandler (FilmEditor::use_dci_name_toggled), 0, this);
+       _edit_dci_button->Connect        (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::edit_dci_button_clicked), 0, this);
+       _container->Connect              (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::container_changed), 0, this);
+       _ratio->Connect                  (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::ratio_changed), 0, this);
+       _content->Connect                (wxID_ANY, wxEVT_COMMAND_LIST_ITEM_SELECTED,   wxListEventHandler    (FilmEditor::content_selection_changed), 0, this);
+       _content->Connect                (wxID_ANY, wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler    (FilmEditor::content_selection_changed), 0, this);
+       _content_add->Connect            (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::content_add_clicked), 0, this);
+       _content_remove->Connect         (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::content_remove_clicked), 0, this);
+       _content_timeline->Connect       (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::content_timeline_clicked), 0, this);
+       _loop_content->Connect           (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED,     wxCommandEventHandler (FilmEditor::loop_content_toggled), 0, this);
+       _loop_count->Connect             (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::loop_count_changed), 0, this);
+       _left_crop->Connect              (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::left_crop_changed), 0, this);
+       _right_crop->Connect             (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::right_crop_changed), 0, this);
+       _top_crop->Connect               (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::top_crop_changed), 0, this);
+       _bottom_crop->Connect            (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::bottom_crop_changed), 0, this);
+       _filters_button->Connect         (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::edit_filters_clicked), 0, this);
+       _scaler->Connect                 (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::scaler_changed), 0, this);
+       _dcp_content_type->Connect       (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::dcp_content_type_changed), 0, this);
+       _dcp_frame_rate->Connect         (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::dcp_frame_rate_changed), 0, this);
+       _best_dcp_frame_rate->Connect    (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::best_dcp_frame_rate_clicked), 0, this);
+       _dcp_audio_channels->Connect     (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::dcp_audio_channels_changed), 0, this);
+       _with_subtitles->Connect         (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED,     wxCommandEventHandler (FilmEditor::with_subtitles_toggled), 0, this);
+       _subtitle_offset->Connect        (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::subtitle_offset_changed), 0, this);
+       _subtitle_scale->Connect         (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::subtitle_scale_changed), 0, this);
+       _j2k_bandwidth->Connect          (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::j2k_bandwidth_changed), 0, this);
+       _audio_gain->Connect             (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::audio_gain_changed), 0, this);
        _audio_gain_calculate_button->Connect (
                wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::audio_gain_calculate_button_clicked), 0, this
                );
-       _show_audio->Connect             (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::show_audio_clicked), 0, this);
-       _audio_delay->Connect            (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::audio_delay_changed), 0, this);
-       _audio_stream->Connect           (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::audio_stream_changed), 0, this);
-       _subtitle_stream->Connect        (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::subtitle_stream_changed), 0, this);
-       _audio_mapping->Changed.connect  (boost::bind (&FilmEditor::audio_mapping_changed, this, _1));
-       _start->Changed.connect          (boost::bind (&FilmEditor::start_changed, this));
-       _length->Changed.connect         (boost::bind (&FilmEditor::length_changed, this));
+       _show_audio->Connect             (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::show_audio_clicked), 0, this);
+       _audio_delay->Connect            (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::audio_delay_changed), 0, this);
+       _audio_stream->Connect           (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::audio_stream_changed), 0, this);
+       _subtitle_stream->Connect        (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::subtitle_stream_changed), 0, this);
+       _audio_mapping->Changed.connect  (boost::bind (&FilmEditor::audio_mapping_changed, this, _1));
+       _start->Changed.connect          (boost::bind (&FilmEditor::start_changed, this));
+       _length->Changed.connect         (boost::bind (&FilmEditor::length_changed, this));
 }
 
 void
@@ -304,27 +304,27 @@ FilmEditor::make_content_panel ()
        _content_sizer = new wxBoxSizer (wxVERTICAL);
        _content_panel->SetSizer (_content_sizer);
 
-        {
-                wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-                
-                _content = new wxListCtrl (_content_panel, wxID_ANY, wxDefaultPosition, wxSize (320, 160), wxLC_REPORT | wxLC_NO_HEADER | wxLC_SINGLE_SEL);
-                s->Add (_content, 1, wxEXPAND | wxTOP | wxBOTTOM, 6);
+       {
+               wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+               
+               _content = new wxListCtrl (_content_panel, wxID_ANY, wxDefaultPosition, wxSize (320, 160), wxLC_REPORT | wxLC_NO_HEADER | wxLC_SINGLE_SEL);
+               s->Add (_content, 1, wxEXPAND | wxTOP | wxBOTTOM, 6);
 
-                _content->InsertColumn (0, wxT(""));
+               _content->InsertColumn (0, wxT(""));
                _content->SetColumnWidth (0, 512);
 
-                wxBoxSizer* b = new wxBoxSizer (wxVERTICAL);
-                _content_add = new wxButton (_content_panel, wxID_ANY, _("Add..."));
-                b->Add (_content_add, 1, wxEXPAND | wxLEFT | wxRIGHT);
-                _content_remove = new wxButton (_content_panel, wxID_ANY, _("Remove"));
-                b->Add (_content_remove, 1, wxEXPAND | wxLEFT | wxRIGHT);
+               wxBoxSizer* b = new wxBoxSizer (wxVERTICAL);
+               _content_add = new wxButton (_content_panel, wxID_ANY, _("Add..."));
+               b->Add (_content_add, 1, wxEXPAND | wxLEFT | wxRIGHT);
+               _content_remove = new wxButton (_content_panel, wxID_ANY, _("Remove"));
+               b->Add (_content_remove, 1, wxEXPAND | wxLEFT | wxRIGHT);
                _content_timeline = new wxButton (_content_panel, wxID_ANY, _("Timeline..."));
                b->Add (_content_timeline, 1, wxEXPAND | wxLEFT | wxRIGHT);
 
-                s->Add (b, 0, wxALL, 4);
+               s->Add (b, 0, wxALL, 4);
 
-                _content_sizer->Add (s, 0.75, wxEXPAND | wxALL, 6);
-        }
+               _content_sizer->Add (s, 0.75, wxEXPAND | wxALL, 6);
+       }
 
        wxBoxSizer* h = new wxBoxSizer (wxHORIZONTAL);
        _loop_content = new wxCheckBox (_content_panel, wxID_ANY, _("Loop everything"));
@@ -698,9 +698,9 @@ FilmEditor::film_content_changed (weak_ptr<Content> weak_content, int property)
                        _length->set (0, 24);
                }
        } else if (property == VideoContentProperty::VIDEO_CROP) {
-               checked_set (_left_crop,   video_content ? video_content->crop().left   : 0);
-               checked_set (_right_crop,  video_content ? video_content->crop().right  : 0);
-               checked_set (_top_crop,    video_content ? video_content->crop().top    : 0);
+               checked_set (_left_crop,   video_content ? video_content->crop().left   : 0);
+               checked_set (_right_crop,  video_content ? video_content->crop().right  : 0);
+               checked_set (_top_crop,    video_content ? video_content->crop().top    : 0);
                checked_set (_bottom_crop, video_content ? video_content->crop().bottom : 0);
                setup_scaling_description ();
        } else if (property == VideoContentProperty::VIDEO_RATIO) {
@@ -1189,7 +1189,7 @@ FilmEditor::content_remove_clicked (wxCommandEvent &)
 void
 FilmEditor::content_selection_changed (wxListEvent &)
 {
-        setup_content_sensitivity ();
+       setup_content_sensitivity ();
        shared_ptr<Content> s = selected_content ();
        
        if (_audio_dialog && s && dynamic_pointer_cast<AudioContent> (s)) {
@@ -1215,17 +1215,17 @@ FilmEditor::content_selection_changed (wxListEvent &)
 void
 FilmEditor::setup_content_sensitivity ()
 {
-        _content_add->Enable (_generally_sensitive);
+       _content_add->Enable (_generally_sensitive);
 
        shared_ptr<Content> selection = selected_content ();
 
-        _content_remove->Enable (selection && _generally_sensitive);
+       _content_remove->Enable (selection && _generally_sensitive);
        _content_timeline->Enable (_generally_sensitive);
 
-       _video_panel->Enable    (selection && dynamic_pointer_cast<VideoContent>  (selection) && _generally_sensitive);
-       _audio_panel->Enable    (selection && dynamic_pointer_cast<AudioContent>  (selection) && _generally_sensitive);
+       _video_panel->Enable    (selection && dynamic_pointer_cast<VideoContent>  (selection) && _generally_sensitive);
+       _audio_panel->Enable    (selection && dynamic_pointer_cast<AudioContent>  (selection) && _generally_sensitive);
        _subtitle_panel->Enable (selection && dynamic_pointer_cast<FFmpegContent> (selection) && _generally_sensitive);
-       _timing_panel->Enable   (selection && _generally_sensitive);
+       _timing_panel->Enable   (selection && _generally_sensitive);
 }
 
 shared_ptr<Content>

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 5c8320295c9d8b9c4e3e39019c2bb11501494d99..1340f37fba81d41858c3b123af0ef4caa5e965bf 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -34,13 +34,13 @@ class RGBPlusAlphaImage;
  *
  *  The film takes the following path through the viewer:
  *
- *  1.  fetch_next_frame() asks our _player to decode some data.  If it does, process_video()
- *      will be called.
+ *  1. fetch_next_frame() asks our _player to decode some data.  If it does, process_video()
+ *     will be called.
  *
- *  2.  process_video() takes the image from the player (_frame).
+ *  2. process_video() takes the image from the player (_frame).
  *
- *  3.  fetch_next_frame() calls _panel->Refresh() and _panel->Update() which results in
- *      paint_panel() being called; this creates frame_bitmap from _frame and blits it to the display.
+ *  3. fetch_next_frame() calls _panel->Refresh() and _panel->Update() which results in
+ *     paint_panel() being called; this creates frame_bitmap from _frame and blits it to the display.
  *
  * fetch_current_frame_again() asks the player to re-emit its current frame on the next pass(), and then
  * starts from step #1.

diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index 7f3c1996b4f7e22e5d935c88bf64d69f4004bc0e..8def5550ab920b670258045df958c45e383aad21 100644 (file)
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -38,7 +38,7 @@ class View
 {
 public:
        View (Timeline& t)
-               : _timeline (t)
+               : _timeline (t)
        {
 
        }
@@ -148,11 +148,11 @@ private:
                }
                
                wxGraphicsPath path = gc->CreatePath ();
-               path.MoveToPoint    (time_x (start),       y_pos (_track) + 4);
+               path.MoveToPoint    (time_x (start),       y_pos (_track) + 4);
                path.AddLineToPoint (time_x (start + len), y_pos (_track) + 4);
                path.AddLineToPoint (time_x (start + len), y_pos (_track + 1) - 4);
-               path.AddLineToPoint (time_x (start),       y_pos (_track + 1) - 4);
-               path.AddLineToPoint (time_x (start),       y_pos (_track) + 4);
+               path.AddLineToPoint (time_x (start),       y_pos (_track + 1) - 4);
+               path.AddLineToPoint (time_x (start),       y_pos (_track) + 4);
                gc->StrokePath (path);
                gc->FillPath (path);
 
@@ -230,7 +230,7 @@ class TimeAxisView : public View
 {
 public:
        TimeAxisView (Timeline& tl, int y)
-               : View (tl)
+               : View (tl)
                , _y (y)
        {}
        

diff --git a/src/wx/wx_ui_signaller.cc b/src/wx/wx_ui_signaller.cc
index 2e926edc6af82dd2794281e436710a6dbc80422e..f306319608a0e194d5128b8f490d600179df4bfc 100644 (file)
--- a/src/wx/wx_ui_signaller.cc
+++ b/src/wx/wx_ui_signaller.cc
@@ -29,6 +29,6 @@ wxUISignaller::wxUISignaller (wxEvtHandler* h)
 void
 wxUISignaller::wake_ui ()
 {
-        wxCommandEvent event (-1, -1);
-        _handler->AddPendingEvent (event);
+       wxCommandEvent event (-1, -1);
+       _handler->AddPendingEvent (event);
 }