Mageia Bugzilla – Attachment 14153 Details for
Bug 32231
guayadeque crashes inside Mageia9 when "enable volume and fader" is activated in settings
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
patch to build the last git clone upon gstreamer 1.22.3 and wxgtk 3.2.1
gstreamer1.22.3-wxwidget3.2.1.patch (text/plain), 4.47 KB, created by
Philippe Didier
on 2023-11-15 04:25:02 CET
(
hide
)
Description:
patch to build the last git clone upon gstreamer 1.22.3 and wxgtk 3.2.1
Filename:
MIME Type:
Creator:
Philippe Didier
Created:
2023-11-15 04:25:02 CET
Size:
4.47 KB
patch
obsolete
>From 90031dc8c1c81abe4f8cbb3f054d8d3b39f1d150 Mon Sep 17 00:00:00 2001 >From: AK <alex.k.4.all@gmail.com> >Date: Wed, 15 Nov 2023 01:50:51 +0100 >Subject: [PATCH] experimental gstreamer-1.22.3 and wxwidgets-3.2.1-3 support > >--- > src/audio/FaderPlaybin.cpp | 17 +++++++++-------- > src/ui/aui/AuiNotebook.cpp | 12 ++++++------ > 2 files changed, 15 insertions(+), 14 deletions(-) > >diff --git a/src/audio/FaderPlaybin.cpp b/src/audio/FaderPlaybin.cpp >index 95843032..9d96c49d 100644 >--- a/src/audio/FaderPlaybin.cpp >+++ b/src/audio/FaderPlaybin.cpp >@@ -390,7 +390,7 @@ static void gst_about_to_finish( GstElement * playbin, guFaderPlaybin::WeakPtr * > static void gst_audio_changed( GstElement * playbin, guFaderPlaybin::WeakPtr * wpp ) > { > guLogDebug( "gst_audio_changed << %p", wpp ); >- if( wpp == NULL) >+ if( (wpp == NULL) || (!GST_IS_BIN(playbin)) ) > { > guLogTrace( "gst_audio_changed: parent fader playbin is null" ); > return; >@@ -514,6 +514,7 @@ guFaderPlaybin::guFaderPlaybin( guMediaCtrl * mediactrl, const wxString &uri, co > guFaderPlaybin::~guFaderPlaybin() > { > guLogDebug( wxT( "guFaderPlaybin::~guFaderPlaybin (%li) e: %i" ), m_Id, m_ErrorCode ); >+ m_SharedPointer.reset(); > if( m_RecordBin != NULL ) > guGstPipelineActuator( m_RecordBin ).Disable(); > //m_Player->RemovePlayBin( this ); >@@ -537,13 +538,6 @@ guFaderPlaybin::~guFaderPlaybin() > guLogDebug( "guFaderPlaybin::~guFaderPlaybin wait on GST_STATE_CHANGE_ASYNC" ); > gst_element_get_state( m_Playbin, NULL, NULL, GST_SECOND ); > } >- // guLogDebug( "mPlaybin refcount: %i", GST_OBJECT_REFCOUNT( m_Playbin ) ); >- GstBus * bus = gst_pipeline_get_bus( GST_PIPELINE( m_Playbin ) ); >- gst_bus_remove_watch( bus ); >- // guLogDebug( "mPlaybin bus refcount: %i", GST_OBJECT_REFCOUNT( bus ) - 1 ); >- gst_object_unref( bus ); >- gst_object_unref( GST_OBJECT( m_Playbin ) ); >- > guGstStateToNullAndUnref( m_FaderVolume ); > guGstStateToNullAndUnref( m_Volume ); > >@@ -551,6 +545,13 @@ guFaderPlaybin::~guFaderPlaybin() > > guGstStateToNullAndUnref( m_ReplayGain ); > guGstStateToNullAndUnref( m_ReplayGainLimiter ); >+ >+ // guLogDebug( "mPlaybin refcount: %i", GST_OBJECT_REFCOUNT( m_Playbin ) ); >+ GstBus * bus = gst_pipeline_get_bus( GST_PIPELINE( m_Playbin ) ); >+ gst_bus_remove_watch( bus ); >+ // guLogDebug( "mPlaybin bus refcount: %i", GST_OBJECT_REFCOUNT( bus ) - 1 ); >+ gst_object_unref( bus ); >+ gst_object_unref( GST_OBJECT( m_Playbin ) ); > } > > if( m_FaderTimeLine ) >diff --git a/src/ui/aui/AuiNotebook.cpp b/src/ui/aui/AuiNotebook.cpp >index a6c271ff..e4cd5280 100644 >--- a/src/ui/aui/AuiNotebook.cpp >+++ b/src/ui/aui/AuiNotebook.cpp >@@ -293,7 +293,7 @@ void guAuiTabArt::DrawTab(wxDC &dc, wxWindow * wnd, const wxAuiNotebookPage &pag > int close_button_width = 0; > if( close_button_state != wxAUI_BUTTON_STATE_HIDDEN ) > { >- close_button_width = m_activeCloseBmp.GetWidth(); >+ close_button_width = m_activeCloseBmp.GetDefaultSize().GetWidth(); > } > > >@@ -303,12 +303,12 @@ void guAuiTabArt::DrawTab(wxDC &dc, wxWindow * wnd, const wxAuiNotebookPage &pag > bitmap_offset = tab_x + 8; > > // draw bitmap >- dc.DrawBitmap(page.bitmap, >+ dc.DrawBitmap(page.bitmap.GetBitmap(page.bitmap.GetDefaultSize()), > bitmap_offset, >- drawn_tab_yoff + (drawn_tab_height/2) - (page.bitmap.GetHeight()/2), >+ drawn_tab_yoff + (drawn_tab_height/2) - (page.bitmap.GetDefaultSize().GetHeight()/2), > true); > >- text_offset = bitmap_offset + page.bitmap.GetWidth(); >+ text_offset = bitmap_offset + page.bitmap.GetDefaultSize().GetWidth(); > text_offset += 3; // bitmap padding > } > else >@@ -331,12 +331,12 @@ void guAuiTabArt::DrawTab(wxDC &dc, wxWindow * wnd, const wxAuiNotebookPage &pag > // draw close button if necessary > if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN) > { >- wxBitmap bmp = m_disabledCloseBmp; >+ wxBitmap bmp = m_disabledCloseBmp.GetBitmap(m_disabledCloseBmp.GetDefaultSize()); > > if (close_button_state == wxAUI_BUTTON_STATE_HOVER || > close_button_state == wxAUI_BUTTON_STATE_PRESSED) > { >- bmp = m_activeCloseBmp; >+ bmp = m_activeCloseBmp.GetBitmap(m_activeCloseBmp.GetDefaultSize()); > } > > wxRect rect(tab_x + tab_width - close_button_width - 1,
From 90031dc8c1c81abe4f8cbb3f054d8d3b39f1d150 Mon Sep 17 00:00:00 2001 From: AK <alex.k.4.all@gmail.com> Date: Wed, 15 Nov 2023 01:50:51 +0100 Subject: [PATCH] experimental gstreamer-1.22.3 and wxwidgets-3.2.1-3 support --- src/audio/FaderPlaybin.cpp | 17 +++++++++-------- src/ui/aui/AuiNotebook.cpp | 12 ++++++------ 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/audio/FaderPlaybin.cpp b/src/audio/FaderPlaybin.cpp index 95843032..9d96c49d 100644 --- a/src/audio/FaderPlaybin.cpp +++ b/src/audio/FaderPlaybin.cpp @@ -390,7 +390,7 @@ static void gst_about_to_finish( GstElement * playbin, guFaderPlaybin::WeakPtr * static void gst_audio_changed( GstElement * playbin, guFaderPlaybin::WeakPtr * wpp ) { guLogDebug( "gst_audio_changed << %p", wpp ); - if( wpp == NULL) + if( (wpp == NULL) || (!GST_IS_BIN(playbin)) ) { guLogTrace( "gst_audio_changed: parent fader playbin is null" ); return; @@ -514,6 +514,7 @@ guFaderPlaybin::guFaderPlaybin( guMediaCtrl * mediactrl, const wxString &uri, co guFaderPlaybin::~guFaderPlaybin() { guLogDebug( wxT( "guFaderPlaybin::~guFaderPlaybin (%li) e: %i" ), m_Id, m_ErrorCode ); + m_SharedPointer.reset(); if( m_RecordBin != NULL ) guGstPipelineActuator( m_RecordBin ).Disable(); //m_Player->RemovePlayBin( this ); @@ -537,13 +538,6 @@ guFaderPlaybin::~guFaderPlaybin() guLogDebug( "guFaderPlaybin::~guFaderPlaybin wait on GST_STATE_CHANGE_ASYNC" ); gst_element_get_state( m_Playbin, NULL, NULL, GST_SECOND ); } - // guLogDebug( "mPlaybin refcount: %i", GST_OBJECT_REFCOUNT( m_Playbin ) ); - GstBus * bus = gst_pipeline_get_bus( GST_PIPELINE( m_Playbin ) ); - gst_bus_remove_watch( bus ); - // guLogDebug( "mPlaybin bus refcount: %i", GST_OBJECT_REFCOUNT( bus ) - 1 ); - gst_object_unref( bus ); - gst_object_unref( GST_OBJECT( m_Playbin ) ); - guGstStateToNullAndUnref( m_FaderVolume ); guGstStateToNullAndUnref( m_Volume ); @@ -551,6 +545,13 @@ guFaderPlaybin::~guFaderPlaybin() guGstStateToNullAndUnref( m_ReplayGain ); guGstStateToNullAndUnref( m_ReplayGainLimiter ); + + // guLogDebug( "mPlaybin refcount: %i", GST_OBJECT_REFCOUNT( m_Playbin ) ); + GstBus * bus = gst_pipeline_get_bus( GST_PIPELINE( m_Playbin ) ); + gst_bus_remove_watch( bus ); + // guLogDebug( "mPlaybin bus refcount: %i", GST_OBJECT_REFCOUNT( bus ) - 1 ); + gst_object_unref( bus ); + gst_object_unref( GST_OBJECT( m_Playbin ) ); } if( m_FaderTimeLine ) diff --git a/src/ui/aui/AuiNotebook.cpp b/src/ui/aui/AuiNotebook.cpp index a6c271ff..e4cd5280 100644 --- a/src/ui/aui/AuiNotebook.cpp +++ b/src/ui/aui/AuiNotebook.cpp @@ -293,7 +293,7 @@ void guAuiTabArt::DrawTab(wxDC &dc, wxWindow * wnd, const wxAuiNotebookPage &pag int close_button_width = 0; if( close_button_state != wxAUI_BUTTON_STATE_HIDDEN ) { - close_button_width = m_activeCloseBmp.GetWidth(); + close_button_width = m_activeCloseBmp.GetDefaultSize().GetWidth(); } @@ -303,12 +303,12 @@ void guAuiTabArt::DrawTab(wxDC &dc, wxWindow * wnd, const wxAuiNotebookPage &pag bitmap_offset = tab_x + 8; // draw bitmap - dc.DrawBitmap(page.bitmap, + dc.DrawBitmap(page.bitmap.GetBitmap(page.bitmap.GetDefaultSize()), bitmap_offset, - drawn_tab_yoff + (drawn_tab_height/2) - (page.bitmap.GetHeight()/2), + drawn_tab_yoff + (drawn_tab_height/2) - (page.bitmap.GetDefaultSize().GetHeight()/2), true); - text_offset = bitmap_offset + page.bitmap.GetWidth(); + text_offset = bitmap_offset + page.bitmap.GetDefaultSize().GetWidth(); text_offset += 3; // bitmap padding } else @@ -331,12 +331,12 @@ void guAuiTabArt::DrawTab(wxDC &dc, wxWindow * wnd, const wxAuiNotebookPage &pag // draw close button if necessary if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN) { - wxBitmap bmp = m_disabledCloseBmp; + wxBitmap bmp = m_disabledCloseBmp.GetBitmap(m_disabledCloseBmp.GetDefaultSize()); if (close_button_state == wxAUI_BUTTON_STATE_HOVER || close_button_state == wxAUI_BUTTON_STATE_PRESSED) { - bmp = m_activeCloseBmp; + bmp = m_activeCloseBmp.GetBitmap(m_activeCloseBmp.GetDefaultSize()); } wxRect rect(tab_x + tab_width - close_button_width - 1,
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 32231
:
13965
|
13973
|
13974
|
13988
|
13989
|
13990
|
13991
|
13992
|
13993
|
13998
|
14114
|
14148
|
14152
|
14153
|
14157
|
14158
|
14159
|
14160
|
14161
|
14162
|
14163
|
14164
|
14165
|
14166