audio wave icons, viewer wave image, 7 lib updates, tweak file size

[goodguy/history.git] / cinelerra-5.1 / cinelerra / vwindowgui.C

diff --git a/cinelerra-5.1/cinelerra/vwindowgui.C b/cinelerra-5.1/cinelerra/vwindowgui.C
index f5fef954182d7565d35a78c40b13d24ada7e7584..d5bd045f8b11880ab218d22ef5f4be38677c5365 100644 (file)
--- a/cinelerra-5.1/cinelerra/vwindowgui.C
+++ b/cinelerra-5.1/cinelerra/vwindowgui.C
@@ -19,10 +19,12 @@
  *
  */
 
+#include "arender.h"
 #include "asset.h"
 #include "assets.h"
 #include "awindowgui.h"
 #include "awindow.h"
+#include "cache.h"
 #include "canvas.h"
 #include "clip.h"
 #include "clipedit.h"
@@ -44,9 +46,12 @@
 #include "mwindow.h"
 #include "playtransport.h"
 #include "preferences.h"
+#include "renderengine.h"
+#include "samples.h"
 #include "theme.h"
 #include "timebar.h"
 #include "tracks.h"
+#include "transportque.h"
 #include "vframe.h"
 #include "vplayback.h"
 #include "vtimebar.h"
@@ -91,6 +96,47 @@ VWindowGUI::~VWindowGUI()
 //     delete source;
 }
 
+void VWindowGUI::draw_wave()
+{
+       TransportCommand command;
+       command.command = NORMAL_FWD;
+       command.get_edl()->copy_all(vwindow->get_edl());
+       command.change_type = CHANGE_ALL;
+       command.realtime = 0;
+       RenderEngine *render_engine = new RenderEngine(0, mwindow->preferences, 0, 0);
+       CICache *cache = new CICache(mwindow->preferences);
+       render_engine->set_acache(cache);
+       render_engine->arm_command(&command);
+
+       double duration = 1.;
+       int w = mwindow->edl->session->output_w;
+       int h = mwindow->edl->session->output_h;
+       VFrame *vframe = new VFrame(w, h, BC_RGB888);
+       int sample_rate = mwindow->edl->get_sample_rate();
+       int channels = mwindow->edl->session->audio_channels;
+       if( channels > 2 ) channels = 2;
+       int64_t bfrsz = sample_rate * duration;
+       Samples *samples[MAXCHANNELS];
+       int ch = 0;
+       while( ch < channels ) samples[ch++] = new Samples(bfrsz);
+       while( ch < MAXCHANNELS ) samples[ch++] = 0;
+       render_engine->arender->process_buffer(samples, bfrsz, 0);
+
+       static int line_colors[2] = { GREEN, YELLOW };
+       static int base_colors[2] = { RED, PINK };
+       for( int i=channels; --i>=0; ) {
+               AssetPicon::draw_wave(vframe, samples[i]->get_data(), bfrsz,
+                       base_colors[i], line_colors[i]);
+       }
+
+       for( int i=channels; --i>=0; ) delete samples[i];
+       delete render_engine;
+       delete cache;
+       delete canvas->refresh_frame;
+       canvas->refresh_frame = vframe;
+       canvas->draw_refresh(1);
+}
+
 void VWindowGUI::change_source(EDL *edl, const char *title)
 {
 //printf("VWindowGUI::change_source %d\n", __LINE__);
@@ -104,6 +150,11 @@ void VWindowGUI::change_source(EDL *edl, const char *title)
                sprintf(string, _(PROGRAM_NAME ": Viewer"));
 
        lock_window("VWindowGUI::change_source");
+       canvas->clear();
+       if( edl &&
+           !edl->tracks->playable_video_tracks() &&
+           edl->tracks->playable_audio_tracks() )
+               draw_wave();
        timebar->update(0);
        set_title(string);
        unlock_window();
@@ -347,12 +398,44 @@ int VWindowGUI::keypress_event()
                        break;
        }
        if(!result) result = transport->keypress_event();
-
        return result;
 }
 
+void VWindowGUI::stop_transport(const char *lock_msg)
+{
+       if( !transport->is_stopped() ) {
+               if( lock_msg ) unlock_window();
+               transport->handle_transport(STOP, 1, 0, 0);
+               if( lock_msg ) lock_window(lock_msg);
+       }
+}
+
 int VWindowGUI::button_press_event()
 {
+       if( vwindow->get_edl() != 0 && canvas->get_canvas() &&
+           canvas->get_canvas()->get_cursor_over_window() ) {
+               switch( get_buttonpress() ) {
+               case LEFT_BUTTON:
+                       if( !vwindow->playback_engine->is_playing_back ) {
+                               double length = vwindow->get_edl()->tracks->total_playable_length();
+                               double position = vwindow->playback_engine->get_tracking_position();
+                               if( position >= length ) transport->goto_start();
+                       }
+                       return transport->forward_play->handle_event();
+               case MIDDLE_BUTTON:
+                       if( !vwindow->playback_engine->is_playing_back ) {
+                               double position = vwindow->playback_engine->get_tracking_position();
+                               if( position <= 0 ) transport->goto_end();
+                       }
+                       return transport->reverse_play->handle_event();
+               case RIGHT_BUTTON:  // activates popup
+                       break;
+               case WHEEL_UP:
+                       return transport->frame_forward_play->handle_event();
+               case WHEEL_DOWN:
+                       return transport->frame_reverse_play->handle_event();
+               }
+       }
        if(canvas->get_canvas())
                return canvas->button_press_event_base(canvas->get_canvas());
        return 0;
@@ -410,6 +493,7 @@ int VWindowGUI::drag_stop()
        {
                highlighted = 0;
                canvas->draw_refresh();
+               unlock_window();
 
                Indexable *indexable = mwindow->session->drag_assets->size() ?
                        mwindow->session->drag_assets->get(0) :
@@ -417,12 +501,12 @@ int VWindowGUI::drag_stop()
                EDL *edl = mwindow->session->drag_clips->size() ?
                        mwindow->session->drag_clips->get(0) :
                        0;
-
                if(indexable)
                        vwindow->change_source(indexable);
                else
                if(edl)
                        vwindow->change_source(edl);
+               lock_window("VWindowGUI::drag_stop");
                return 1;
        }
 
@@ -640,15 +724,11 @@ void VWindowEditing::set_outpoint()
        vwindow->set_outpoint();
 }
 
-void VWindowEditing::clear_inpoint()
+void VWindowEditing::unset_inoutpoint()
 {
-       vwindow->clear_inpoint();
+       vwindow->unset_inoutpoint();
 }
 
-void VWindowEditing::clear_outpoint()
-{
-       vwindow->clear_outpoint();
-}
 
 void VWindowEditing::to_clip()
 {
@@ -879,7 +959,7 @@ void VWindowGUI::update_points()
 
 //printf("VWindowGUI::update_points 2\n");
        long pixel = (long)((double)edl->local_session->in_point /
-               edl->tracks->total_playable_length() *
+               edl->tracks->total_length() *
                (mwindow->theme->vtimebar_w -
                        2 *
                        mwindow->theme->in_point[0]->get_w())) +
@@ -931,7 +1011,7 @@ void VWindowGUI::update_points()
 //printf("VWindowGUI::update_points 10\n");
 
        pixel = (long)((double)edl->local_session->out_point /
-               (edl->tracks->total_playable_length() + 0.5) *
+               (edl->tracks->total_length() + 0.5) *
                (mwindow->theme->vtimebar_w -
                        2 *
                        mwindow->theme->in_point[0]->get_w())) +