Merge branch 'master' into some-view-changes

# Conflicts:
#	src/lib/VueJanus.vue
remotes/1693057678009958606/master
Mustafa Yontar 5 years ago
commit 620bf920c8
  1. 21
      src/lib/PdfShare.vue
  2. 6
      src/lib/VueJanus.vue

@ -15,6 +15,11 @@
<v-btn v-if="pdf && !loading" :disabled="pageNumber ==1" @click="prevPage" icon><v-icon>mdi-chevron-left</v-icon></v-btn> <v-btn v-if="pdf && !loading" :disabled="pageNumber ==1" @click="prevPage" icon><v-icon>mdi-chevron-left</v-icon></v-btn>
<span v-if="pdf && !loading">{{pageNumber}} / {{pdf.numPages}}</span> <span v-if="pdf && !loading">{{pageNumber}} / {{pdf.numPages}}</span>
<v-btn v-if="pdf && !loading" :disabled="pdf.numPages == pageNumber" @click="nextPage" icon><v-icon>mdi-chevron-right</v-icon></v-btn> <v-btn v-if="pdf && !loading" :disabled="pdf.numPages == pageNumber" @click="nextPage" icon><v-icon>mdi-chevron-right</v-icon></v-btn>
<v-row>
<v-col cols="12" md="12">
<v-btn v-if="pdf && !loading" @click="stop">stop pdf share</v-btn>
</v-col>
</v-row>
</div> </div>
</template> </template>
@ -31,6 +36,7 @@ export default {
name: "PdfShare", name: "PdfShare",
props: { props: {
janusInit: Object, janusInit: Object,
onstop: Function,
username: String, username: String,
myrivid: Number, myrivid: Number,
room: Number, room: Number,
@ -95,6 +101,21 @@ export default {
pluginHandle.send({"message": register}); pluginHandle.send({"message": register});
}, },
stop(){
var unpublish = { "request": "unpublish"};
this.pluginHandle.send({"message": unpublish});
this.pluginHandle.detach();
// reset
this.pluginHandle = null;
this.pdf = null;
this.pageNumber = 1;
this.loading = true;
// callback
this.onstop();
},
janusPluginError (error) { janusPluginError (error) {
console.log('error', error) console.log('error', error)
}, },

@ -13,8 +13,11 @@
Firefox handles screensharing in a different way: are you going to share the whole screen, or would you rather pick a single window/application to share instead? Firefox handles screensharing in a different way: are you going to share the whole screen, or would you rather pick a single window/application to share instead?
</v-card-text> </v-card-text>
<v-card-actions> <v-card-actions>
<v-spacer></v-spacer>
<v-btn @click="shareScreenStart('screen')">Share a screen</v-btn> <v-btn @click="shareScreenStart('screen')">Share a screen</v-btn>
<v-spacer></v-spacer>
<v-btn @click="shareScreenStart('window')">Share a window</v-btn> <v-btn @click="shareScreenStart('window')">Share a window</v-btn>
<v-spacer></v-spacer>
</v-card-actions> </v-card-actions>
</v-card> </v-card>
</v-dialog> </v-dialog>
@ -203,6 +206,9 @@
}, },
methods: { methods: {
stopSharePdf(){
this.sharePdf=false;
},
webrtcState (on) { webrtcState (on) {
this.pluginHandle.send({"message": { "request": "configure", "bitrate": 512*1000 }}); this.pluginHandle.send({"message": { "request": "configure", "bitrate": 512*1000 }});
console.log(on, "webrt") console.log(on, "webrt")

Loading…
Cancel
Save