Reduced files

Mudlet · Nov 25, 2022 · 565883c · 565883c
1 parent c6ca669
commit 565883c
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 85 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -154,7 +154,6 @@ set(mudlet_SRCS
     TTreeWidget.cpp
     TTrigger.cpp
     TVar.cpp
-    TVideoPlayer.cpp
     VarUnit.cpp
     XMLexport.cpp
     XMLimport.cpp)
@@ -319,7 +318,6 @@ set(mudlet_HDRS
     TTreeWidget.h
     TTrigger.h
     TVar.h
-    TVideoPlayer.h
     VarUnit.h
     utils.h
     widechar_width.h

diff --git a/src/TMedia.cpp b/src/TMedia.cpp
@@ -68,7 +68,9 @@ void TMedia::playMedia(TMediaData& mediaData)
         return;
     }
 
-    if (mediaData.getMediaInput() == TMediaData::MediaInputFile) {
+    if (mediaData.getMediaInput() == TMediaData::MediaInputStream) {
+        mediaData.setMediaAbsolutePathFileName(mediaData.getMediaFileName());
+    } else if (mediaData.getMediaInput() == TMediaData::MediaInputFile) {
         bool fileRelative = TMedia::isFileRelative(mediaData);
 
         if (!fileRelative && (mediaData.getMediaProtocol() == TMediaData::MediaProtocolMSP || mediaData.getMediaProtocol() == TMediaData::MediaProtocolGMCP)) {
@@ -1148,7 +1150,7 @@ void TMedia::play(TMediaData& mediaData)
             mpHost->showHideOrCreateVideoPlayer();
         }
 
-        auto videoWidget = mpHost->mpMedia->mpVideoPlayer->mpVideoPlayer;
+        auto videoWidget = mpHost->mpMedia->mpVideoPlayer->widget_video;
         pPlayer.getMediaPlayer()->setVideoOutput(videoWidget);
         videoWidget->show();
     }

diff --git a/src/TVideoPlayer.cpp b/src/TVideoPlayer.cpp
diff --git a/src/TVideoPlayer.h b/src/TVideoPlayer.h
diff --git a/src/dlgVideoPlayer.cpp b/src/dlgVideoPlayer.cpp
@@ -35,8 +35,6 @@ dlgVideoPlayer::dlgVideoPlayer(QWidget* parent, Host* pH, TMedia* pM)
     setupUi(this);
 
     mpMedia->mpVideoPlayer = this;
-    mpVideoPlayer->mpHost = pH;
-    mpVideoPlayer->mpMedia = pM;
     widget_panel->setVisible(mpHost->mShowVideoPlayerPanel);
 }
 

diff --git a/src/mudlet.pro b/src/mudlet.pro
@@ -656,7 +656,6 @@ SOURCES += \
     TTreeWidget.cpp \
     TTrigger.cpp \
     TVar.cpp \
-    TVideoPlayer.cpp \
     VarUnit.cpp \
     XMLexport.cpp \
     XMLimport.cpp
@@ -783,7 +782,6 @@ HEADERS += \
     TTreeWidget.h \
     TTrigger.h \
     TVar.h \
-    TVideoPlayer.h \
     VarUnit.h \
     utils.h \
     XMLexport.h \

diff --git a/src/ui/video_player.ui b/src/ui/video_player.ui
@@ -33,7 +33,7 @@
     <number>0</number>
    </property>
    <item>
-    <widget class="TVideoPlayer" name="mpVideoPlayer" native="true">
+    <widget class="QVideoWidget" name="widget_video" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
        <horstretch>0</horstretch>
@@ -105,14 +105,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>TVideoPlayer</class>
-   <extends>QVideoWidget</extends>
-   <header location="global">TVideoPlayer.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections/>
 </ui>