videolan
/
vlc
mirror of https://gitea.goldendeliverer.com/videolan/vlc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

src/modules: use vlc_shared_data_ptr directly 

Now that the template declaration of vlc_shared_data_ptr is more
reasonable, we can use the class directly instead of using the
intermediate macro.
pull/188/head
Johannes Kauffmann 10 months ago
committed by Steve Lhomme
parent
7b45bc8072
commit
93baa24bbb
13 changed files with 35 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      modules/gui/qt/network/addonsmodel.cpp
  2. 12
      modules/gui/qt/network/vlcmediasourcewrapper.hpp
  3. 4
      modules/gui/qt/player/input_models.hpp
  4. 12
      modules/gui/qt/player/player_controller.cpp
  5. 4
      modules/gui/qt/player/player_controller.hpp
  6. 2
      modules/gui/qt/player/player_controller_p.hpp
  7. 6
      modules/gui/qt/playlist/playlist_item.hpp
  8. 6
      modules/gui/qt/tests/test_renderer_manager_model.cpp
  9. 2
      modules/gui/qt/util/renderer_manager.cpp
  10. 6
      modules/gui/qt/util/shared_input_item.hpp
  11. 4
      modules/gui/qt/util/varcommon_p.hpp
  12. 6
      modules/misc/medialibrary/fs/directory.cpp
  13. 2
      src/test/shared_data_ptr.cpp

4
modules/gui/qt/network/addonsmodel.cpp
View File

@ -59,8 +59,8 @@ CHECK_ADDON_STATE_MATCH(UNINSTALLING);
namespace {
using AddonPtr = vlc_shared_data_ptr_type(addon_entry_t,
addon_entry_Hold, addon_entry_Release);
using AddonPtr = ::vlc::vlc_shared_data_ptr<addon_entry_t,
&addon_entry_Hold, &addon_entry_Release>;
class AddonItem {
public:

12
modules/gui/qt/network/vlcmediasourcewrapper.hpp
View File

@ -24,13 +24,13 @@
#include <vlc_media_source.h>
#include <vlc_cxx_helpers.hpp>
using MediaSourcePtr = vlc_shared_data_ptr_type(vlc_media_source_t,
vlc_media_source_Hold,
vlc_media_source_Release);
using MediaSourcePtr = ::vlc::vlc_shared_data_ptr<vlc_media_source_t,
&vlc_media_source_Hold,
&vlc_media_source_Release>;
using MediaTreePtr = vlc_shared_data_ptr_type(vlc_media_tree_t,
vlc_media_tree_Hold,
vlc_media_tree_Release);
using MediaTreePtr = ::vlc::vlc_shared_data_ptr<vlc_media_tree_t,
&vlc_media_tree_Hold,
&vlc_media_tree_Release>;
class MediaTreeLocker
{

4
modules/gui/qt/player/input_models.hpp
View File

@ -90,7 +90,7 @@ private:
QString m_title;
//vlc_es_id_t *m_id = NULL;
vlc_shared_data_ptr_type(vlc_es_id_t, vlc_es_id_Hold, vlc_es_id_Release) m_id;
::vlc::vlc_shared_data_ptr<vlc_es_id_t, &vlc_es_id_Hold, &vlc_es_id_Release> m_id;
bool m_selected = false;
};
QList<Data> m_data;
@ -139,7 +139,7 @@ signals:
private:
vlc_player_t* m_player;
typedef vlc_shared_data_ptr_type(vlc_player_title_list, vlc_player_title_list_Hold, vlc_player_title_list_Release) PlayerTitleList;
typedef ::vlc::vlc_shared_data_ptr<vlc_player_title_list, &vlc_player_title_list_Hold, &vlc_player_title_list_Release> PlayerTitleList;
PlayerTitleList m_titleList;
int m_current = -1;
int m_count = 0;

12
modules/gui/qt/player/player_controller.cpp
View File

@ -49,13 +49,13 @@
//PlayerController private implementation
using SharedEsId = vlc_shared_data_ptr_type(vlc_es_id_t,
vlc_es_id_Hold,
vlc_es_id_Release);
using SharedEsId = ::vlc::vlc_shared_data_ptr<vlc_es_id_t,
&vlc_es_id_Hold,
&vlc_es_id_Release>;
using SharedTitleList = vlc_shared_data_ptr_type(vlc_player_title_list,
vlc_player_title_list_Hold,
vlc_player_title_list_Release);
using SharedTitleList = ::vlc::vlc_shared_data_ptr<vlc_player_title_list,
&vlc_player_title_list_Hold,
&vlc_player_title_list_Release>;
PlayerControllerPrivate::~PlayerControllerPrivate()
{

4
modules/gui/qt/player/player_controller.hpp
View File

@ -38,8 +38,8 @@ Q_MOC_INCLUDE("util/renderer_manager.hpp")
using vlc_player_locker = vlc_locker<vlc_player_t, vlc_player_Lock, vlc_player_Unlock>;
using SharedVOutThread = vlc_shared_data_ptr_type(vout_thread_t, vout_Hold, vout_Release);
using SharedAOut = vlc_shared_data_ptr_type(audio_output_t, aout_Hold, aout_Release);
using SharedVOutThread = ::vlc::vlc_shared_data_ptr<vout_thread_t, &vout_Hold, &vout_Release>;
using SharedAOut = ::vlc::vlc_shared_data_ptr<audio_output_t, &aout_Hold, &aout_Release>;
class RendererManager;
class QSignalMapper;

2
modules/gui/qt/player/player_controller_p.hpp
View File

@ -120,7 +120,7 @@ public:
TrackListModel m_audioTracks;
TrackListModel m_subtitleTracks;
vlc_shared_data_ptr_type(vlc_es_id_t, vlc_es_id_Hold, vlc_es_id_Release) m_secondarySpuEsId;
::vlc::vlc_shared_data_ptr<vlc_es_id_t, &vlc_es_id_Hold, &vlc_es_id_Release> m_secondarySpuEsId;
VLCDuration m_audioDelay;
VLCDuration m_subtitleDelay;

6
modules/gui/qt/playlist/playlist_item.hpp
View File

@ -34,9 +34,9 @@
//namespace vlc {
// namespace playlist {
using SharedPlaylistItem = vlc_shared_data_ptr_type(vlc_playlist_item_t,
vlc_playlist_item_Hold,
vlc_playlist_item_Release);
using SharedPlaylistItem = ::vlc::vlc_shared_data_ptr<vlc_playlist_item_t,
&vlc_playlist_item_Hold,
&vlc_playlist_item_Release>;
/**
* Playlist item wrapper.

6
modules/gui/qt/tests/test_renderer_manager_model.cpp
View File

@ -22,9 +22,9 @@
#include "../util/renderer_manager.hpp"
using RendererItemPtr = vlc_shared_data_ptr_type(vlc_renderer_item_t,
vlc_renderer_item_hold,
vlc_renderer_item_release);
using RendererItemPtr = ::vlc::vlc_shared_data_ptr<vlc_renderer_item_t,
&vlc_renderer_item_hold,
&vlc_renderer_item_release>;
class TestClass : public QObject
{

2
modules/gui/qt/util/renderer_manager.cpp
View File

@ -33,7 +33,7 @@
static void player_renderer_changed(vlc_player_t *, vlc_renderer_item_t *new_item, void *data);
using RendererItemPtr = vlc_shared_data_ptr_type(vlc_renderer_item_t, vlc_renderer_item_hold, vlc_renderer_item_release);
using RendererItemPtr = ::vlc::vlc_shared_data_ptr<vlc_renderer_item_t, &vlc_renderer_item_hold, &vlc_renderer_item_release>;
using vlc_player_locker = vlc_locker<vlc_player_t, vlc_player_Lock, vlc_player_Unlock>;
struct ItemEntry

6
modules/gui/qt/util/shared_input_item.hpp
View File

@ -30,9 +30,9 @@
#include <vlc_cxx_helpers.hpp>
using SharedInputItem = vlc_shared_data_ptr_type(input_item_t,
input_item_Hold,
input_item_Release);
using SharedInputItem = ::vlc::vlc_shared_data_ptr<input_item_t,
&input_item_Hold,
&input_item_Release>;
Q_DECLARE_METATYPE(SharedInputItem)

4
modules/gui/qt/util/varcommon_p.hpp
View File

@ -89,7 +89,7 @@ public:
private:
static void obj_hold( vout_thread_t* obj ) { vout_Hold(obj); }
static void obj_release( vout_thread_t* obj ) { vout_Release(obj); }
typedef vlc_shared_data_ptr_type(vout_thread_t, obj_hold, obj_release) SharedPtr;
typedef ::vlc::vlc_shared_data_ptr<vout_thread_t, &obj_hold, &obj_release> SharedPtr;
SharedPtr m_object;
};
@ -149,7 +149,7 @@ public:
private:
static void obj_hold( audio_output_t* obj ) { aout_Hold(obj); }
static void obj_release( audio_output_t* obj ) { aout_Release(obj); }
typedef vlc_shared_data_ptr_type(audio_output_t, obj_hold, obj_release) SharedPtr;
typedef ::vlc::vlc_shared_data_ptr<audio_output_t, &obj_hold, &obj_release> SharedPtr;
SharedPtr m_object;
};

6
modules/misc/medialibrary/fs/directory.cpp
View File

@ -41,9 +41,9 @@
#include <system_error>
#include <vector>
using InputItemPtr = vlc_shared_data_ptr_type(input_item_t,
input_item_Hold,
input_item_Release);
using InputItemPtr = ::vlc::vlc_shared_data_ptr<input_item_t,
&input_item_Hold,
&input_item_Release>;
namespace vlc {
namespace medialibrary {

2
src/test/shared_data_ptr.cpp
View File

@ -21,7 +21,7 @@ static void mockrc_Release(mockrc *p)
p->count--;
}
using MockRcPtr = vlc_shared_data_ptr_type(mockrc, mockrc_Hold, mockrc_Release);
using MockRcPtr = ::vlc::vlc_shared_data_ptr<mockrc, &mockrc_Hold, &mockrc_Release>;
static void test_raii()
{

Write Preview
Loading…
Cancel
Save